summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-14 19:05:16 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-14 19:05:16 +0100
commit5b4d966be7d97468611c7f72758c09ae658ee77a (patch)
tree88a583d44885371c08dd67e5160b7a35f2d69a9b
parent8e8b549db9eb8c4d96050af9577ee4f694a343bf (diff)
downloadjenkins.debian.net-5b4d966be7d97468611c7f72758c09ae658ee77a.tar.xz
silence cleanup
-rwxr-xr-xbin/test_torbrowser-launcher.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index b37b991f..7bf624a0 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -11,14 +11,17 @@ set -e
cleanup_all() {
set +e
+ # preserve screenshots
+ [ ! -f screenshot.png ] || mv screenshot.png $WORKSPACE/ || true
+ [ ! -f screenshot-thumb.png ] || mv screenshot-thumb.png $WORKSPACE/ || true
+ # actual cleanup starts here
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
rm $TMPDIR -r
# kill xvfb
- kill $XPID
+ kill $XPID 2>/dev/null|| true
# end
echo "$(date -u) - $TMPDIR deleted. Cleanup done."
}