Even motre fixes to regression script

This commit is contained in:
pelya
2011-10-18 16:43:53 +03:00
parent 4ae69fbd42
commit fa0c6805bb

View File

@@ -32,28 +32,30 @@ fi
echo Revisions from "$FROM" to "$TO" , step "$STEP" echo Revisions from "$FROM" to "$TO" , step "$STEP"
rm -rf regression/regression rm -rf regression/regression
cp -r project/jni/application/regression regression/regression cp -r project/jni/application/regression regression/regression
OLDBRANCH=`git branch | grep '*' | sed 's/[* ]*//'`
git checkout -f "@{$TO}" git checkout -f "@{$TO}"
CURRENT="`git log -n 1 --format='%cD' --`" CURRENT="`git log -n 1 --format='%cD' --`"
while [ `date -d "$CURRENT" "+%s"` -gt `date -d "$FROM" "+%s"` ] ; do while [ `date -d "$CURRENT" "+%s"` -gt `date -d "$FROM" "+%s"` ] ; do
CURFMT="`git log -n 1 --format='%ci' -- | sed 's/[+].*//' | sed 's/ /::/'`" CURFMT="`git log -n 1 --format='%ci' -- | sed 's/[+].*//' | sed 's/ /::/'`"
echo $CURFMT CURFMT=$CURFMT
rm -f project/jni/application/src rm -f project/jni/application/src
rm -rf project/jni/application/regression rm -rf project/jni/application/regression
cp -rf regression/regression project/jni/application/regression cp -rf regression/regression project/jni/application/regression
ln -s regression project/jni/application/src ln -s regression project/jni/application/src
#./ChangeAppSettings.sh -a ./ChangeAppSettings.sh -a
echo "#define BUILDDATE \"$CURFMT\"" > project/jni/application/regression/regression.h echo "#define BUILDDATE \"$CURFMT\"" > project/jni/application/regression/regression.h
rm -rf project/obj rm -rf project/obj
cd project cd project
#nice -n19 ndk-build V=1 -j4 && ant debug && cp -f bin/DemoActivity-debug.apk ../regression/$CURFMT.apk nice -n19 ndk-build V=1 -j4 && ant debug && cp -f bin/DemoActivity-debug.apk ../regression/$CURFMT.apk
cd .. cd ..
#adb install -r $CURFMT.apk adb install -r $CURFMT.apk
#adb shell am start -n net.olofson.ballfield.regression/.MainActivity adb shell am start -n net.olofson.ballfield.regression/.MainActivity
sleep 5 sleep 5
echo BUILDDATE $CURFMT: "`git log -n 1 --format="%s"`" >> regression/regression.txt 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 adb shell logcat -d -t 20 | grep "SDL REGRESSION BUILDDATE $CURFMT" >> regression/regression.txt
git checkout -f "HEAD~$STEP" git checkout -f "HEAD~$STEP"
CURRENT="`git log -n 1 --format='%cD' --`" CURRENT="`git log -n 1 --format='%cD' --`"
done done
rm -rf project/jni/application/regression
git checkout -f "$OLDBRANCH"