summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-15 15:28:32 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-15 15:28:32 +0100
commit51798a2a3ea8c4c1c0eafae0a7a7ecde7c2ece3b (patch)
tree76e9f2b349095ce97172507f4f3dadc52663f6d1
parent4d624ea87498f1e34c0d7239ab3f9a7f9bd1230f (diff)
downloadjenkins.debian.net-51798a2a3ea8c4c1c0eafae0a7a7ecde7c2ece3b.tar.xz
torbrowser: disable debug, show environment
-rwxr-xr-xbin/test_torbrowser-launcher.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 34f1f00f..d0322582 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -34,7 +34,6 @@ update_screenshot() {
}
first_test() {
- set -x
local SESSION="tbb-launcher-$SUITE-$(basename $TMPDIR)"
schroot --begin-session --session-name=$SESSION -c jenkins-torbrowser-launcher-$SUITE
schroot --run-session -c $SESSION --directory /tmp -u root -- mkdir $HOME
@@ -43,6 +42,7 @@ first_test() {
Xvfb -ac -br -screen 0 1024x768x16 :$SCREEN &
XPID=$!
export DISPLAY=":$SCREEN.0"
+ export
timeout -k 12m 11m schroot --run-session -c $SESSION --preserve-environment -- torbrowser-launcher https://www.debian.org &
ffmpeg -f x11grab -i :$SCREEN.0 test-torbrowser-$SUITE.mpg > /dev/null 2>&1 &
FFMPEGPID=$!
@@ -57,7 +57,6 @@ first_test() {
done
schroot --end-session -c $SESSION
kill $XPID $FFMPEGPID || true
- if ! "$DEBUG" ; then set +x ; fi
}
#