-#!/bin/bash -x
+#!/bin/bash
a_dir=$(dirname $0)
for aut in linux_run.sh salome_run.sh; do
squishserver --config addAUT ${aut} $(pwd)
done
-squishserver --config setAUTTimeout 60
+squishserver --config setAUTTimeout 120
squishserver --verbose --port=${SQUISHSERVER_PORT} --stop
squishserver --verbose --port=${SQUISHSERVER_PORT} 2>server.err &
squishrunner --port=${SQUISHSERVER_PORT} --config setCursorAnimation off
RETVAL=0
-for suite in ./test.squish/suite_*
-do
+
+squishrunner_run() {
+ local suite=$1
+ local cases="$2"
+
+ echo "Running suite ${suite}"
+ if [ ${cases} != "" ]; then echo "Cases ${cases}"; fi
+
set +e
- squishrunner --port=${SQUISHSERVER_PORT} --testsuite ${suite} --reportgen stdout --exitCodeOnFail 1
+ squishrunner --port=${SQUISHSERVER_PORT} --testsuite ${suite} ${cases} --reportgen stdout --exitCodeOnFail 1
EXIT_CODE=$?
set -e
if [ ${EXIT_CODE} = '1' ]; then RETVAL=1; fi
+}
+
+squishrunner_batch() {
+ local suite=$1
+ local tests=$2
+
+ set +x
+ local tests_arg=
+ for test in ${tests}; do
+ tests_arg="${tests_arg} --testcase ${test}"
+ done
+ set -x
+
+ echo ${tests_arg}
+ squishrunner_run ${suite} "${tests_arg}"
+}
+
+#squishrunner_batch ./test.squish/suite_ISSUES 'tst_BASE tst_DISTANCE tst_PARALLEL_1 tst_PARALLEL_2 tst_PERPENDICULAR_1 tst_RADIUS tst_c tst_common_1 tst_crash_1 tst_818 tst_532'
+#squishrunner_batch ./test.squish/suite_ISSUES_SALOME 'tst_sketch_001 tst_sketch_002 tst_sketch_003 tst_sketch_004 tst_sketch_005 tst_sketch_006 tst_sketch_007 tst_sketch_008 tst_sketch_009 tst_sketch_010 tst_sketch_011 tst_474 tst_532 tst_576 tst_679'
+
+for suite in ./test.squish/suite_*; do
+ squishrunner_run ${suite}
done
+
+
+
squishserver --verbose --port=${SQUISHSERVER_PORT} --stop
for aut in linux_run.sh salome_run.sh; do
squishserver --config removeAUT ${aut} $(pwd)