[Qa-jenkins-scm] [jenkins.debian.net] 01/01: torbrowser: disable debug, show environment

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 51798a2a3ea8c4c1c0eafae0a7a7ecde7c2ece3b
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Nov 15 15:28:32 2015 +0100

    torbrowser: disable debug, show environment
---
 bin/test_torbrowser-launcher.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 34f1f00..d032258 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
 }
 
 #

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git