diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-11-15 15:13:20 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-11-15 15:13:20 +0100 |
| commit | 4d624ea87498f1e34c0d7239ab3f9a7f9bd1230f (patch) | |
| tree | 99b244a19c4fcae1614629ff3f22ffdf51b7bdcd | |
| parent | 7c679f3c7cea3871045c04415c36e41bd31cd38e (diff) | |
| download | jenkins.debian.net-4d624ea87498f1e34c0d7239ab3f9a7f9bd1230f.tar.xz | |
torbrowser: cleanup job output, run tbb-l a second time
| -rwxr-xr-x | bin/test_torbrowser-launcher.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh index 775fb12f..34f1f00f 100755 --- a/bin/test_torbrowser-launcher.sh +++ b/bin/test_torbrowser-launcher.sh @@ -16,7 +16,6 @@ cleanup_all() { # preserve screenshots [ ! -f screenshot.png ] || mv screenshot.png $WORKSPACE/ [ ! -f screenshot-thumb.png ] || mv screenshot-thumb.png $WORKSPACE/ - [ ! -f screenshot.png ] || mv screenshot.png $WORKSPACE/ [ ! -f test-torbrowser-$SUITE.mpg ] || mv test-torbrowser-$SUITE.mpg $WORKSPACE/ # delete session if it still exists schroot --end-session -c tbb-launcher-$SUITE-$(basename $TMPDIR) > /dev/null 2>&1 || true @@ -45,9 +44,14 @@ first_test() { XPID=$! export DISPLAY=":$SCREEN.0" 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 & + ffmpeg -f x11grab -i :$SCREEN.0 test-torbrowser-$SUITE.mpg > /dev/null 2>&1 & FFMPEGPID=$! - for i in $(seq 1 6) ; do + for i in $(seq 1 4) ; do + sleep 1m + update_screenshot + done + timeout -k 12m 11m schroot --run-session -c $SESSION --preserve-environment -- torbrowser-launcher https://www.debian.org & + for i in $(seq 1 4) ; do sleep 1m update_screenshot done @@ -71,9 +75,6 @@ first_test # test package from the archive # then build package and test it (probably via triggering another job) # not sure how to test updates. maybe just run old install? -# publish results -mv screenshot.png screenshot-thumb.png $WORKSPACE/ - cd cleanup_all trap - INT TERM EXIT |