diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-09-04 14:15:17 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-09-04 14:15:17 +0200 |
| commit | 2c76d72d412c1d7a2e615cd036f0730faa81dff7 (patch) | |
| tree | 56d6ed27e80770557d9d1f60f98fee00f25129a1 /test/integration/framework | |
| parent | 1efc8dbc3932d557880e37603be9a39a73a4d493 (diff) | |
| parent | fe5804fc5010dd8f2e9406187bfc1f6afeb29c5a (diff) | |
merged from lp:~donkult/apt/experimental
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/test/integration/framework b/test/integration/framework index da85d2332..f7576668a 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -688,7 +688,17 @@ signreleasefiles() { } changetowebserver() { - if which weborf > /dev/null; then + + if [ -n "$1" ] && ! test -x ${BUILDDIRECTORY}/aptwebserver; then + msgdie 'Need the aptwebserver when passing arguments' + fi + + if test -x ${BUILDDIRECTORY}/aptwebserver; then + cd aptarchive + LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver $@ 2> /dev/null > /dev/null & + addtrap "kill $!;" + cd - > /dev/null + elif which weborf > /dev/null; then weborf -xb aptarchive/ 2>&1 > /dev/null & addtrap "kill $!;" elif which gatling > /dev/null; then |