#858 'Tangency' constraint doesn't work

[modules/shaper.git] / test_squish.sh

diff --git a/test_squish.sh b/test_squish.sh
index d2fe367ecad818933874de829b0b027781585e15..e051548088c4a0288deec2f82fa0b4bd4afee54f 100755 (executable)
--- a/test_squish.sh
+++ b/test_squish.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -x
 
+a_dir=$(dirname $0)
+
 set -e
 
 if [ "$#" = 1 ]; then
@@ -8,7 +10,9 @@ elif [ -z ${SQUISHSERVER_PORT} ]; then
   SQUISHSERVER_PORT=4320
 fi
 
-source env_squish.sh
+export TEST_DATA_DIR=$(cd ${a_dir}; pwd)/test.squish/shared/testdata
+
+source ${a_dir}/env_squish.sh
 
 for aut in linux_run.sh salome_run.sh; do
   squishserver --config addAUT ${aut} $(pwd)
@@ -17,15 +21,29 @@ squishserver --config setAUTTimeout 60
 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 tests=$2
+
+  set +x
+  local tests_arg=
+  for test in ${tests}; do
+    tests_arg="${tests_arg} --testcase ${test}"
+  done
+  set -x
+
   set +e
-  squishrunner --port=${SQUISHSERVER_PORT} --testsuite ${suite} --reportgen stdout --exitCodeOnFail 1
+  squishrunner --port=${SQUISHSERVER_PORT} --testsuite ${suite} ${tests_arg} --reportgen stdout --exitCodeOnFail 1
   EXIT_CODE=$?
   set -e
   if [ ${EXIT_CODE} = '1' ]; then RETVAL=1; fi
-done
+}
+
+squishrunner_run ./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'
 
 squishserver --verbose --port=${SQUISHSERVER_PORT} --stop
 for aut in linux_run.sh salome_run.sh; do