Enable "make test" - tested on Linux only at this stage.

3 files changed, 134 insertions, 0 deletions

diff --git a/features/systemtest.prf b/features/systemtest.prf
new file mode 100644
index 0000000..44a2898
--- /dev/null
+++ b/features/systemtest.prf
@@ -0,0 +1,24 @@
+SRCDIR=$$replace(OUT_PWD, $$BUILDROOT, $$SRCROOT)
+BUILDDIR=$$OUT_PWD
+
+TEMPLATE=subdirs
+
+unix:!mac:!symbian {
+    test.commands = $$[QT_INSTALL_BINS]/qtuitestrunner $$SRCDIR/$$SOURCES $(ARGS)
+    QMAKE_EXTRA_TARGETS+=test
+
+    storetest.commands = PATH=$$[QT_INSTALL_BINS]:$$BUILDDIR:\$\$PATH BUILDDIR=$$BUILDDIR $$SRCROOT/scripts/storetest $$SRCDIR/$$SOURCES $(ARGS)
+    QMAKE_EXTRA_TARGETS+=storetest
+}
+
+mac {
+    test.commands = $$[QT_INSTALL_BINS]/qtuitestrunner $$BUILDDIR/$$SOURCES $(ARGS)
+    QMAKE_EXTRA_TARGETS+=test
+}
+
+win32 {
+    WIN_SRCDIR=$$replace(SRCDIR,/,\)
+
+    test.commands=cmd /c $$[QT_INSTALL_BINS]\\qtuitestrunner $${WIN_SRCDIR}\\$${SOURCES}
+    QMAKE_EXTRA_TARGETS+=test
+}
diff --git a/scripts/storetest b/scripts/storetest
new file mode 100755
index 0000000..61cff5c
--- /dev/null
+++ b/scripts/storetest
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+STORETESTRESULTS=storetestresults
+
+if ! command -v $STORETESTRESULTS 2&>1 > /dev/null; then
+    STORETESTRESULTS=`dirname $0`/$STORETESTRESULTS
+    if ! [ -e $STORETESTRESULTS ]; then
+        echo $STORETESTRESULTS not found
+        exit 1
+    fi
+fi
+
+echo -n "Test platform [$QTUITEST_PLATFORM] : "
+read TESTPLATFORM
+if [ "$TESTPLATFORM" = "" ]; then
+    TESTPLATFORM=$QTUITEST_PLATFORM
+fi
+case "$TESTPLATFORM" in *symbian*|*linux*|*maemo*|*windows*|*wince*|*mac*)
+    ;;
+*)
+    echo Test platform must contain one of symbian, linux, maemo, windows, wince, mac
+    exit 1
+    ;;
+esac
+
+echo -n "Change or build number [$QTUITEST_CHANGE] : "
+read TESTCHANGE
+if [ "$TESTCHANGE" = "" ]; then
+    if [ "$QTUITEST_CHANGE" = "" ]; then
+        echo Change or build number must be specified
+        exit 1
+    fi
+    TESTCHANGE=$QTUITEST_CHANGE
+fi
+
+echo -n "Branch [$QTUITEST_BRANCH] : "
+read TESTBRANCH
+if [ "$TESTBRANCH" = "" ]; then
+    if [ "$QTUITEST_BRANCH" = "" ]; then
+        echo Branch must be specified
+        exit 1
+    fi
+    TESTBRANCH=$QTUITEST_BRANCH
+fi
+
+echo -n "Upload location [$QTUITEST_TESTR] : "
+read TESTTESTR
+if [ "$TESTTESTR" = "" ]; then
+    if [ "$QTUITEST_TESTR" = "" ]; then
+        echo Upload location must be specified
+        exit 1
+    fi
+    TESTTESTR=$QTUITEST_TESTR
+fi
+
+TIMESTAMP=`date +%s`
+TESTNAME=`basename $BUILDDIR`
+RESULTSDIR=/tmp/qtuitest_results_$TIMESTAMP
+mkdir $RESULTSDIR
+TESTPLATFORM=$TESTPLATFORM qtuitestrunner $* -xml -o $RESULTSDIR/$TESTNAME.xml
+
+if [ -e $RESULTSDIR/$TESTNAME.xml ]; then
+    echo Results are in $RESULTSDIR/$TESTNAME.xml
+else
+    echo Results are not in expected location!
+    exit 1
+fi
+
+$STORETESTRESULTS -in $RESULTSDIR -number $TIMESTAMP -testr $TESTTESTR -prefix $TESTPLATFORM -testrchange $TESTCHANGE -testrbranch $TESTBRANCH
+if [ $? != "0" ]; then
+    echo FAILED: Please check you have entered the correct details.
+    echo You can retry sending the results using the scp command above
+    exit 1
+else
+    echo OK
+fi
\ No newline at end of file
diff --git a/systemtests.pro b/systemtests.pro
new file mode 100644
index 0000000..155ff2a
--- /dev/null
+++ b/systemtests.pro
@@ -0,0 +1,34 @@
+TEMPLATE=subdirs
+SUBDIRS=ASFOrbit Qt QtMobility
+#CONFIG+=ordered
+
+system(echo DEFINES+=QTUITEST_IMAGE_PATH=$$OUT_PWD > $$OUT_PWD/.qmake.cache)
+system(echo QMAKEFEATURES+=$$PWD/features >> $$OUT_PWD/.qmake.cache)
+
+unix:!mac:!symbian {
+    system(if ! [ -e $$OUT_PWD/features ]; then ln -sf $$PWD/features $$OUT_PWD/features; fi)
+    system(echo SRCROOT=$(readlink -f $$PWD) >> $$OUT_PWD/.qmake.cache)
+    system(echo BUILDROOT=$(readlink -f $$OUT_PWD) >> $$OUT_PWD/.qmake.cache)
+}
+
+mac {
+    system(if ! [ -e $$OUT_PWD/features ]; then ln -sf $$PWD/features $$OUT_PWD/features; fi)
+    system(echo SRCROOT='$$PWD' >> $$OUT_PWD/.qmake.cache)
+    system(echo BUILDROOT='$$OUT_PWD' >> $$OUT_PWD/.qmake.cache)
+}
+
+
+symbian {
+    SUBDIRS-=qtbindings libqsystemtest interpreter
+    system(echo SRCROOT=$$PWD >> $$OUT_PWD/.qmake.cache)
+    system(echo BUILDROOT=$$OUT_PWD >> $$OUT_PWD/.qmake.cache)
+}
+
+win32 {
+    WIN_PWD=$$replace(PWD,/,\)
+    WIN_OUT_PWD=$$replace(OUT_PWD,/,\)
+    system(xcopy $$WIN_PWD\features $$WIN_OUT_PWD\features /E /I /D /Y)
+    system(echo SRCROOT=$$PWD >> $$OUT_PWD/.qmake.cache)
+    system(echo BUILDROOT=$$OUT_PWD >> $$OUT_PWD/.qmake.cache)
+    system(echo INSTALLROOT=$$OUT_PWD/bin >> $$OUT_PWD/.qmake.cache)
+}