X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/704c26980e576b01caf27af751ca5ca08f8f355a..8c6fa3fbaccc22127280bf77a48fab5a3ee0716e:/functest/do.sh?ds=sidebyside diff --git a/functest/do.sh b/functest/do.sh index 77d928a5..652dbcec 100755 --- a/functest/do.sh +++ b/functest/do.sh @@ -4,7 +4,7 @@ MKTEMP=/usr/bin/mktemp RM=/bin/rm printf "Creating temporary dir... " -DIR=`$MKTEMP -d` +DIR=`$MKTEMP -d 2> /dev/null || $MKTEMP -d -t stg` if [ "$DIR" == "" ] then @@ -20,7 +20,7 @@ fi LOGFILE=`date "+%Y-%m-%d-%H%M%S.log"` -printf "Ok.\nCloning... " +printf "Ok. Working dir: $DIR\nCloning... " ./clone.sh "$DIR" >> "$LOGFILE" 2>&1 if [ "$?" != "0" ] then @@ -35,16 +35,12 @@ then printf "Failed.\n" exit -1 else - printf "Ok.\nTesting... " + printf "Ok.\n" fi + ./test.sh "$DIR" # >> "$LOGFILE" 2>&1 -if [ "$?" != "0" ] -then - printf "Failed.\n" - exit -1 -else - printf "Ok.\nCleaning up... " -fi + +printf "Cleaning up... " $RM -rf $DIR if [ "$?" != "0" ]