Index: build/unittest.sh =================================================================== diff -u -rbea075d8fe2a1253dd3720e82b1c06f9d54ddf79 -r708f97084d082ecac27e49db4b97149ba6812d98 --- build/unittest.sh (.../unittest.sh) (revision bea075d8fe2a1253dd3720e82b1c06f9d54ddf79) +++ build/unittest.sh (.../unittest.sh) (revision 708f97084d082ecac27e49db4b97149ba6812d98) @@ -31,27 +31,13 @@ echo "Clone Test Suites..." git clone ssh://git@dvm-linux02:7999/ui/testsuites.git -# --------------------------- Start Squish server -echo "Starting squishserver on port=$SQUISH_SERVER_PORT..." -$SQUISH_DIR/bin/squishserver --port $SQUISH_SERVER_PORT 1>$REPORT/server.log 2>$REPORT/server.err & -sleep 5 - -# --------------------------- Register the AUT -echo "Register AUT..." -$SQUISH_DIR/bin/squishserver --port $SQUISH_SERVER_PORT --config addAUT $PWD/$BUID_DIR/denali - # --------------------------- Run the Squish runner echo "Starting tests..." -$SQUISH_DIR/bin/squishrunner --port $SQUISH_SERVER_PORT --testsuite testsuites --exitCodeOnFail 13 --reportgen html,$REPORT/UnitTest +$SQUISH_DIR/bin/squishrunner addAUT $BUID_DIR/denali --testsuite testsuites --local --exitCodeOnFail 13 --reportgen html,$REPORT/UnitTest -# --------------------------- Stop Squish server -echo "Stopping squishserver..." -$SQUISH_DIR/bin/squishserver --port $SQUISH_SERVER_PORT --stop -sleep 5 - # --------------------------- Run the denali application as a test, since the Squish Qt can't run it right now. cd $BUID_DIR -./denali +./denali & sleep 5 killall denali sleep 5