summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-15 17:29:53 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-15 17:29:53 +0100
commitf7b10ed74d17531d6a8eb926e9f74d04ac6b0714 (patch)
tree1a69eb77856931d3bad0600df9aaa3ddf49556fa /bin
parente6a976ee9bbfec6e8eaeb0af97296a3e7f10b4e9 (diff)
downloadjenkins.debian.net-f7b10ed74d17531d6a8eb926e9f74d04ac6b0714.tar.xz
torbrowser tests: preserve artifacts too
Diffstat (limited to 'bin')
-rwxr-xr-xbin/test_torbrowser-launcher.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index b329f57e..622d5b33 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -17,6 +17,7 @@ cleanup_all() {
[ ! -f screenshot.png ] || mv screenshot.png $RESULTS/
[ ! -f screenshot-thumb.png ] || mv screenshot-thumb.png $RESULTS/
[ ! -f test-torbrowser-$SUITE.mpg ] || mv test-torbrowser-$SUITE.mpg $RESULTS/
+ [ ! -f screenshot_from_git.png ] || mv screenshot_from_git.png screenshot.png
# shutdown and end session if it still exists
schroot --run-session -c $SESSION --directory /tmp -u root -- service dbus stop || true
schroot --end-session -c tbb-launcher-$SUITE-$(basename $TMPDIR) > /dev/null 2>&1 || true
@@ -53,7 +54,7 @@ first_test() {
unset https_proxy
timeout -k 12m 11m schroot --run-session -c $SESSION --preserve-environment -- awesome &
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 &
+ ffmpeg -f x11grab -i :$SCREEN.0 -s 1024x768 test-torbrowser-${SUITE}_$(date +%Y%m%d%H%M).mpg > /dev/null 2>&1 &
FFMPEGPID=$!
for i in $(seq 1 16) ; do
sleep 15
@@ -77,13 +78,13 @@ first_test() {
TMPDIR=$(mktemp -d) # where everything actually happens
trap cleanup_all INT TERM EXIT
WORKSPACE=$(pwd)
-mkdir -p results
RESULTS=$WORKSPACE/results
+[ ! -f screenshot.png ] || mv screenshot.png screenshot_from_git.png
+mkdir -p $RESULTS
cd $TMPDIR
SUITE=$1
echo "$(date -u) - testing torbrowser-launcher on $SUITE now."
-[ ! -f screenshot.png ] || rm screenshot.png
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?