aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-09-05 10:14:56 -0400
committerNick Mathewson <nickm@torproject.org>2018-09-05 10:14:56 -0400
commitff1486385aed1172c18a8a593dec2684de891f60 (patch)
tree2db96ac907f82076c63fad570915be52948298ce
parent4e4b6a247661f1ad78de6b07cee3de5bf2a96aa1 (diff)
parent35b0ac8d8419695f7b7e89d73355ba53b6d13204 (diff)
downloadtor-ff1486385aed1172c18a8a593dec2684de891f60.tar.gz
tor-ff1486385aed1172c18a8a593dec2684de891f60.zip
Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9
-rw-r--r--.travis.yml2
-rw-r--r--changes/bug274183
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 5b0c4baf59..a323b4ecd4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -134,7 +134,7 @@ install:
script:
- ./autogen.sh
- CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules"
- - echo $CONFIGURE_FLAGS
+ - echo "Configure flags are $CONFIGURE_FLAGS"
- ./configure $CONFIGURE_FLAGS
## We run `make check` because that's what https://jenkins.torproject.org does.
- if [[ "$DISTCHECK" == "" ]]; then make check; fi
diff --git a/changes/bug27418 b/changes/bug27418
new file mode 100644
index 0000000000..1d99497dc4
--- /dev/null
+++ b/changes/bug27418
@@ -0,0 +1,3 @@
+ o Minor bugfixes (continuous integration):
+ - When we use echo in Travis, don't pass a --flag as the first argument.
+ Fixes bug 27418; bugfix on 0.3.4.7-rc.