From ed4252ab8fc7546e16c9ece8b395ff797d7cf116 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 2 Dec 2012 16:22:29 +0100 Subject: fixup: workspace + results handling --- bin/cd_tester.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh index 1c36e24c..07f03313 100755 --- a/bin/cd_tester.sh +++ b/bin/cd_tester.sh @@ -37,12 +37,18 @@ else KERNEL=linux INITRD=initrd.gz fi + +# +# define workspace + results +# rm -rf results mkdir -p results -cd results +WORKSPACE=$(pwd) +RESULTS=$WORKSPACE/results cleanup_all() { set -x + cd $RESULTS # # create video # @@ -55,7 +61,7 @@ cleanup_all() { # sudo kill -9 $(ps fax | grep -v grep | grep -v sudo | grep qemu-system | grep ${NAME}-preseed.cfg 2>/dev/null | cut -d " " -f1) sleep 0.3s - rm $NAME.qcow + rm $WORKSPACE/$NAME.qcow # # cleanup # @@ -63,6 +69,7 @@ cleanup_all() { } bootstrap() { + cd $WORKSPACE echo "Doing cd tests for $NAME now." qemu-img create -f qcow $NAME.qcow 20g case $NAME in @@ -84,6 +91,7 @@ bootstrap() { } monitor_installation() { + cd $RESULTS sleep 2 echo "Taking screenshots every 2secs now, until the installation is finished or 5h have passed" NR=0 -- cgit v1.2.3-70-g09d2