diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-11-14 18:51:56 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-11-14 18:51:56 +0100 |
| commit | 8e8b549db9eb8c4d96050af9577ee4f694a343bf (patch) | |
| tree | 1c6b6e4753b3c00766c3c63930a8166cb1bb0b29 | |
| parent | b792a84a1443eeae327f9851720d81d5a82bd83a (diff) | |
| download | jenkins.debian.net-8e8b549db9eb8c4d96050af9577ee4f694a343bf.tar.xz | |
refactor
| -rwxr-xr-x | bin/test_torbrowser-launcher.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh index 4768308d..b37b991f 100755 --- a/bin/test_torbrowser-launcher.sh +++ b/bin/test_torbrowser-launcher.sh @@ -10,7 +10,9 @@ common_init "$@" set -e cleanup_all() { + set +e cd + mv screenshot.png screenshot-thumb.png $WORKSPACE/ || true # delete session if it still exists schroot --end-session -c tbb-launcher-$SUITE-$(basename $TMPDIR) > /dev/null 2>&1 || true # delete main work dir @@ -18,7 +20,6 @@ cleanup_all() { # kill xvfb kill $XPID # end - mv screenshot.png screenshot-thumb.png $WORKSPACE/ || true echo "$(date -u) - $TMPDIR deleted. Cleanup done." } @@ -44,8 +45,8 @@ first_test() { sleep 1m update_screenshot done - kill $XPID schroot --end-session -c $SESSION + kill $XPID || true if ! "$DEBUG" ; then set +x ; fi } |