summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authordac <qt-info@nokia.com>2010-06-11 16:19:57 +1000
committerdac <qt-info@nokia.com>2010-06-11 16:19:57 +1000
commit24e9a7b8e31131506c89eebdea10f3520c833e1a (patch)
treedd7d8620015f8d2662ee2499871d41a8c0082bd4 /scripts
parent90108571f9c904aafa20ad731e34d74b809e2ac1 (diff)
Make qtuitest install into Qt installation directories.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/storetest9
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/storetest b/scripts/storetest
index 8153c07..61cff5c 100755
--- a/scripts/storetest
+++ b/scripts/storetest
@@ -43,12 +43,13 @@ if [ "$TESTBRANCH" = "" ]; then
TESTBRANCH=$QTUITEST_BRANCH
fi
-if [ "$QTUITEST_TESTR" = "" ]; then
- QTUITEST_TESTR=qt@gitestr.nokia.troll.no:/home/qt/results
-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
@@ -56,7 +57,7 @@ TIMESTAMP=`date +%s`
TESTNAME=`basename $BUILDDIR`
RESULTSDIR=/tmp/qtuitest_results_$TIMESTAMP
mkdir $RESULTSDIR
-TESTPLATFORM=$TESTPLATFORM PATH=$BUILDDIR:$PATH QTUITEST_INCLUDE_PATH=$SRCROOT/tests/shared:$QTUITEST_INCLUDE_PATH LD_LIBRARY_PATH=$BUILDROOT/libqsystemtest:$BUILDROOT/lib:$LD_LIBRARY_PATH $BUILDROOT/interpreter/qtuitestrunner $* -xml -o $RESULTSDIR/$TESTNAME.xml
+TESTPLATFORM=$TESTPLATFORM qtuitestrunner $* -xml -o $RESULTSDIR/$TESTNAME.xml
if [ -e $RESULTSDIR/$TESTNAME.xml ]; then
echo Results are in $RESULTSDIR/$TESTNAME.xml