diff options
| author | teor <teor@torproject.org> | 2020-03-16 20:54:24 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-03-16 20:54:24 +1000 |
| commit | 4f2257477c2b35a25577b7b4fd50461811204a7d (patch) | |
| tree | d86064feca928c467af755c0d24c69844fc5da5f | |
| parent | 65187d9de7b5a8696f439d633fcf2791dd346343 (diff) | |
| parent | c22696e3606f9873ddbf02b11dc91214853b8317 (diff) | |
| download | tor-4f2257477c2b35a25577b7b4fd50461811204a7d.tar.gz tor-4f2257477c2b35a25577b7b4fd50461811204a7d.zip | |
Merge branch 'maint-0.4.1' into release-0.4.1
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | changes/ticket32792 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 14b0e12c7a..987e56cc7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -238,7 +238,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 diff --git a/changes/ticket32792 b/changes/ticket32792 new file mode 100644 index 0000000000..553cf0ca81 --- /dev/null +++ b/changes/ticket32792 @@ -0,0 +1,3 @@ + o Testing: + - When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool + to produce detailed diagnostic output. Closes ticket 32792. |