commit 93d12baf89c2a55b8a3e40a026b3990dd671a1f7 parent a255ca9b1228e70088cd6fd624dbcca86a9376ae Author: teor <teor@torproject.org> Date: Mon, 16 Mar 2020 20:54:34 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 Diffstat:
| M | .travis.yml | | | 2 | +- |
| A | changes/ticket32792 | | | 3 | +++ |
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml @@ -259,7 +259,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 @@ -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.