diff options
| author | Colin Walters <walters@verbum.org> | 2016-12-30 14:18:34 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-01-04 16:32:11 +0000 |
| commit | ced22f6c9b096d6bb337886fafd06eae1b888005 (patch) | |
| tree | a81d392dc34dd53363fe8e3ed386964730b570d5 /tests/test-commit-sign.sh | |
| parent | c051ee4a35c90451f891eb52a0b44554df59912e (diff) | |
| download | ostree-ced22f6c9b096d6bb337886fafd06eae1b888005.tar.gz | |
Split trivial-httpd into separate binary
Working on the libcurl backend, I hit the issue that the trivial-httpd program
depends on libsoup. I briefly considered having two versions, but libcurl is
client only, and moreover trivial-httpd is no longer trivial - it has various
features which are used by the test suite extensively.
Hence, what we'll do is build it as a separate binary which links to libsoup,
and use it during the tests. We *also* currently still provide `ostree
trivial-httpd` since some things use it like `rpm-ostree-toolbox` and the
Cockpit tests.
After those are ported to use some other webserver, I plan to add a build-time
option to drop it.
Closes: #636
Approved by: jlebon
Diffstat (limited to 'tests/test-commit-sign.sh')
| -rwxr-xr-x | tests/test-commit-sign.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test-commit-sign.sh b/tests/test-commit-sign.sh index 60265c1a..f963b104 100755 --- a/tests/test-commit-sign.sh +++ b/tests/test-commit-sign.sh @@ -53,7 +53,7 @@ cd ${test_tmpdir} mkdir ${test_tmpdir}/httpd cd httpd ln -s ${test_tmpdir}/ostree-srv ostree -${CMD_PREFIX} ostree trivial-httpd --autoexit --daemonize -P 18081 -p ${test_tmpdir}/httpd-port +${OSTREE_HTTPD} --autoexit --daemonize -P 18081 -p ${test_tmpdir}/httpd-port port=$(cat ${test_tmpdir}/httpd-port) assert_streq $port 18081 echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address |