diff options
| author | Alex Kiernan <alex.kiernan@gmail.com> | 2019-10-19 22:20:27 +0100 |
|---|---|---|
| committer | Alex Kiernan <alex.kiernan@gmail.com> | 2019-10-19 22:20:27 +0100 |
| commit | 967ea6692187e43487f939298eff1e8024399775 (patch) | |
| tree | ca39b2129d8ed21f8dbdb6bf422daacf53ca0485 /ci | |
| parent | 8f0b225d600bdead23b4cf32d092a33b372eae57 (diff) | |
| download | ostree-967ea6692187e43487f939298eff1e8024399775.tar.gz | |
Revert "Always enable trivial-httpd for tests"
This reverts commit 82699a67dbb6bfcc9452bb969e7872809232a84f.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build.sh | 5 | ||||
| -rwxr-xr-x | ci/travis-build.sh | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/ci/build.sh b/ci/build.sh index 806af050..09015074 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -22,11 +22,6 @@ case "${CONFIGOPTS:-}" in fi ;; esac -# unless libsoup is disabled, enable trivial-httpd for the tests -case "${CONFIGOPTS:-}" in - *--without-soup*) ;; - *) CONFIGOPTS="${CONFIGOPTS:-} --enable-trivial-httpd-cmdline" ;; -esac # always fail on warnings; https://github.com/ostreedev/ostree/pull/971 # NB: this disables the default set of flags from configure.ac diff --git a/ci/travis-build.sh b/ci/travis-build.sh index 7c85313a..3fd969bd 100755 --- a/ci/travis-build.sh +++ b/ci/travis-build.sh @@ -85,7 +85,6 @@ make="make -j${ci_parallel} V=1 VERBOSE=1" ../configure \ --enable-always-build-tests \ - --enable-trivial-httpd-cmdline \ ${ci_configopts} "$@" |