summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-06-05 16:12:07 -0400
committerNick Mathewson <nickm@torproject.org>2019-06-05 16:12:07 -0400
commit851e881f01355b0290e79100c09dbedd425f8946 (patch)
tree16fa3e5e147c8054496172c4452f2a6722e51470
parenta56d7e37aa8f52397f9fd762d07b85f3360afd2a (diff)
parent9a97b5ff56fc6f29d93ee515eb7244fe4db34c66 (diff)
downloadtor-851e881f01355b0290e79100c09dbedd425f8946.tar.gz
tor-851e881f01355b0290e79100c09dbedd425f8946.zip
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0
-rw-r--r--.travis.yml1
-rw-r--r--changes/ticket302342
2 files changed, 3 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index ab7db2a928..8e258aef26 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -230,6 +230,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 [[ "$TEST_STEM" != "" ]]; then cat "$STEM_SOURCE_DIR"/test/data/tor_log || echo "cat failed"; fi
before_cache:
## Delete all gcov files.
diff --git a/changes/ticket30234 b/changes/ticket30234
new file mode 100644
index 0000000000..5a0076bad2
--- /dev/null
+++ b/changes/ticket30234
@@ -0,0 +1,2 @@
+ o Testing (continuous integration):
+ - In Travis, show stem's tor log after failure. Closes ticket 30234.