Unverified Commit 9ef8f5d1 authored by teor's avatar teor
Browse files

Merge branch 'maint-0.4.1' into maint-0.4.2

parents 2f4fa423 c22696e3

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ after_failure: 
  ## `make distcheck` puts it somewhere different.

  - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi

  - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi

  - if [[ "$CHUTNEY" != "" ]]; then ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi

  - if [[ "$CHUTNEY" != "" ]]; then "$CHUTNEY_PATH/tools/diagnostics.sh" || echo "diagnostics failed"; ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi

  - if [[ "$TEST_STEM" != "" ]]; then tail -1000 "$STEM_SOURCE_DIR"/test/data/tor_log || echo "tail failed"; fi

  - if [[ "$TEST_STEM" != "" ]]; then grep -v "SocketClosed" stem.log | tail -1000 || echo "grep | tail failed"; fi

changes/ticket32792

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Testing:

    - When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool

      to produce detailed diagnostic output. Closes ticket 32792.