diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-01-26 13:06:31 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-01-26 16:21:25 +0100 |
| commit | a0db467c7eb0e63b8e74887403689e2b446dde7f (patch) | |
| tree | cada4ce1f4e6f15b8d2044d3be5546dbcfbffda4 /test | |
| parent | abaf0b8831bfb415137b10f56d89d3180906be38 (diff) | |
fixup merge issues introduced in 796673c
Issues in doc/po/de.po (fixed by Chris already) and
test/integration/framework
Git-Dch: Ignore
Diffstat (limited to 'test')
| -rw-r--r-- | test/integration/framework | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/framework b/test/integration/framework index 5439244f7..5b9a58568 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -880,7 +880,8 @@ changetowebserver() { fi if test -x ${APTWEBSERVERBINDIR}/aptwebserver; then cd aptarchive - if ! aptwebserver -o aptwebserver::fork=1 "$@" >webserver.log 2>&1 ; then + local LOG="webserver.log" + if ! aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1 ; then cat $LOG false fi @@ -1006,7 +1007,6 @@ testequal() { fi local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequal.comparefile" - addtrap "rm $COMPAREFILE;" echo "$1" > $COMPAREFILE shift |