diff options
| author | teor <teor@torproject.org> | 2018-08-09 17:06:13 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-09 22:18:12 +1000 |
| commit | 7cf7b52fcab81c55a4c493bad68eddc0d27a0d63 (patch) | |
| tree | da3cc4cc230521c6166445a17631ba1b6af7e51d | |
| parent | 515d190b2ca9249871d04067c3bdbd312669997e (diff) | |
| download | tor-7cf7b52fcab81c55a4c493bad68eddc0d27a0d63.tar.gz tor-7cf7b52fcab81c55a4c493bad68eddc0d27a0d63.zip | |
Travis: create configure flags once, then echo the flags
Creating the configure flags once avoids inconsistent flags
between configure and distcheck configure.
Echoing the flags helps developers work out what configure is
doing.
(Backported to 0.2.9 and later as a precaution.)
Fixes 27088 on 0.3.4.1-alpha, adds logging in previous releases.
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | changes/bug27088 | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index d75c74ebb6..6169c808ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,10 +108,12 @@ install: script: - ./autogen.sh - - ./configure $COVERAGE_OPTIONS $HARDENING_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules + - CONFIGURE_FLAGS="$COVERAGE_OPTIONS $HARDENING_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules" + - echo $CONFIGURE_FLAGS + - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" ]]; then make check; fi - - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$HARDENING_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules"; fi + - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi after_failure: ## configure will leave a log file with more details of config failures. diff --git a/changes/bug27088 b/changes/bug27088 new file mode 100644 index 0000000000..d4d3b292c5 --- /dev/null +++ b/changes/bug27088 @@ -0,0 +1,5 @@ + o Minor bugfixes (continuous integration): + - Pass the module flags to distcheck configure, and + log the flags before running configure. (Backported + to 0.2.9 and later as a precaution.) + Fixes bug 27088; bugfix on 0.3.4.1-alpha. |