diff --git a/regression.sh b/regression.sh index c25173abf..dbd52c262 100755 --- a/regression.sh +++ b/regression.sh @@ -31,10 +31,12 @@ if [ -z "$STEP" ] ; then fi export OLDBRANCH=`git branch | grep '*' | sed 's/[* ]*//'` +export CURDIR="`pwd`" function restoreGit() { echo Restoring Git branch "$OLDBRANCH" - rm -rf project/jni/application/regression + rm -rf "$CURDIR/project/jni/application/regression" git checkout -f "$OLDBRANCH" + exit 0 } trap restoreGit SIGHUP @@ -54,17 +56,18 @@ cp -rf regression/regression project/jni/application/regression ln -s regression project/jni/application/src ./ChangeAppSettings.sh -a echo "#define BUILDDATE \"$CURFMT\"" > project/jni/application/regression/regression.h -rm -rf project/obj +#rm -rf project/obj cd project nice -n19 ndk-build V=1 -j4 && ant debug && cp -f bin/DemoActivity-debug.apk ../regression/$CURFMT.apk cd .. -adb install -r $CURFMT.apk +adb install -r regression/$CURFMT.apk adb shell am start -n net.olofson.ballfield.regression/.MainActivity -sleep 5 +sleep 15 echo BUILDDATE $CURFMT: "`git log -n 1 --format="%s"`" >> regression/regression.txt adb shell logcat -d -t 20 | grep "SDL REGRESSION BUILDDATE $CURFMT" >> regression/regression.txt git checkout -f "HEAD~$STEP" CURRENT="`git log -n 1 --format='%cD' --`" done + restoreGit