X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=test_squish.sh;h=f62ab8adc369138b85efe31481fb107bbddb52dd;hb=858c637019b6d468b41e0b68bd94ee823ec36f73;hp=d2fe367ecad818933874de829b0b027781585e15;hpb=8a0e84a23452aa1b25b56056ce3e3ca225b806ec;p=modules%2Fshaper.git

diff --git a/test_squish.sh b/test_squish.sh
index d2fe367ec..f62ab8adc 100755
--- a/test_squish.sh
+++ b/test_squish.sh
@@ -1,35 +1,134 @@
-#!/bin/bash -x
+#!/bin/bash
 
-set -e
+# This sctipt uses:
+# SOURCES_DIR - where test.squish is placed
+# AUT_DIR - where linux_run.sh, salome_run.sh are placed
+# SQUISH_PORT - the port for squishserver
+# PATH - should contain squishserver, squishrunner
 
-if [ "$#" = 1 ]; then
-  SQUISHSERVER_PORT=$1
-elif [ -z ${SQUISHSERVER_PORT} ]; then
-  SQUISHSERVER_PORT=4320
-fi
+export TEST_DATA_DIR=${SOURCES_DIR}/test.squish/shared/testdata
+export SQUISH_GRABWINDOW_CLASSES=AppElements_ViewPort,OCCViewer_ViewPort3d
 
-source env_squish.sh
+SERVEROPTIONS_ARGS="${SERVEROPTIONS_ARGS} --port=${SQUISH_PORT}"
 
+# config squishserver
 for aut in linux_run.sh salome_run.sh; do
-  squishserver --config addAUT ${aut} $(pwd)
+  squishserver --config addAUT ${aut} ${AUT_DIR}
 done
-squishserver --config setAUTTimeout 60
-squishserver --verbose --port=${SQUISHSERVER_PORT} --stop
-squishserver --verbose --port=${SQUISHSERVER_PORT} 2>server.err &
+squishserver --config setAUTTimeout 120
+# stop previous version
+squishserver ${SERVEROPTIONS_ARGS} --verbose --stop >/dev/null 2>&1
+# start squishserver
+squishserver ${SERVEROPTIONS_ARGS} --verbose 1>log_squishserver 2>err_squishserver &
+
+# config squishrunner
+squishrunner --port=${SQUISH_PORT} --config setCursorAnimation off
+# start squishrunner
 
 RETVAL=0
-for suite in ./test.squish/suite_*
-do
-  set +e
-  squishrunner --port=${SQUISHSERVER_PORT} --testsuite ${suite} --reportgen stdout --exitCodeOnFail 1
+
+squishrunner-run() {
+  local TESTSUITE=$1
+  local TESTCASES="$2"
+
+  local SQUISHRUNNER_ARGS=""
+  SQUISHRUNNER_ARGS="${SQUISHRUNNER_ARGS} --testsuite ${SOURCES_DIR}/test.squish/${TESTSUITE}"
+  SQUISHRUNNER_ARGS="${SQUISHRUNNER_ARGS} --resultdir ${SOURCES_DIR}/test.squish_results/${TESTSUITE}"
+  SQUISHRUNNER_ARGS="${SQUISHRUNNER_ARGS} --reportgen xmljunit,${SOURCES_DIR}/test.squish_results/${TESTSUITE}_results.xml"
+  SQUISHRUNNER_ARGS="${SQUISHRUNNER_ARGS} ${TESTCASES}"
+  SQUISHRUNNER_ARGS="${SQUISHRUNNER_ARGS} --exitCodeOnFail 1"
+  squishrunner ${SERVEROPTIONS_ARGS} ${SQUISHRUNNER_ARGS}
   EXIT_CODE=$?
-  set -e
   if [ ${EXIT_CODE} = '1' ]; then RETVAL=1; fi
-done
+}
+
+TESTCASES=""
+TESTCASES="${TESTCASES} --testcase tst_BASE"
+TESTCASES="${TESTCASES} --testcase tst_PARALLEL_1"
+TESTCASES="${TESTCASES} --testcase tst_PARALLEL_2"
+TESTCASES="${TESTCASES} --testcase tst_PERPENDICULAR_1"
+#TESTCASES="${TESTCASES} --testcase tst_532"
+TESTCASES="${TESTCASES} --testcase tst_818"
+TESTCASES="${TESTCASES} --testcase tst_c"
+TESTCASES="${TESTCASES} --testcase tst_common_1"
+TESTCASES="${TESTCASES} --testcase tst_crash_1"
+TESTCASES="${TESTCASES} --testcase tst_DISTANCE"
+TESTCASES="${TESTCASES} --testcase tst_RADIUS"
+#squishrunner-run suite_STANDALONE "${TESTCASES}"
+
+TESTCASES=""
+TESTCASES="${TESTCASES} --testcase tst_679"
+squishrunner-run suite_ERROR_NOTIFICATION "${TESTCASES}"
+
+TESTCASES=""
+TESTCASES="${TESTCASES} --testcase tst_ACTIVE_DOC_MANAGEMENT"
+squishrunner-run suite_OBJECT_BROWSER "${TESTCASES}"
+
+TESTCASES=""
+TESTCASES="${TESTCASES} --testcase tst_474"
+TESTCASES="${TESTCASES} --testcase tst_576"
+TESTCASES="${TESTCASES} --testcase tst_903"
+squishrunner-run suite_FEATURE_PARAMETERS "${TESTCASES}"
+
+TESTCASES=""
+#TESTCASES="${TESTCASES} --testcase tst_532"
+#squishrunner-run suite_ISSUES_SALOME "${TESTCASES}"
+
+TESTCASES=""
+TESTCASES="${TESTCASES} --testcase tst_boolean_001"
+TESTCASES="${TESTCASES} --testcase tst_boolean_002"
+TESTCASES="${TESTCASES} --testcase tst_boolean_003"
+squishrunner-run suite_FEATURE_BOOLEAN "${TESTCASES}"
+
+TESTCASES=""
+TESTCASES="${TESTCASES} --testcase tst_construction_001"
+squishrunner-run suite_FEATURE_CONSTRUCTION "${TESTCASES}"
+
+TESTCASES=""
+TESTCASES="${TESTCASES} --testcase tst_extrusion_001"
+TESTCASES="${TESTCASES} --testcase tst_extrusion_002"
+TESTCASES="${TESTCASES} --testcase tst_extrusion_003"
+TESTCASES="${TESTCASES} --testcase tst_extrusion_004"
+TESTCASES="${TESTCASES} --testcase tst_extrusion_006"
+squishrunner-run suite_FEATURE_EXTRUSION "${TESTCASES}"
+
+TESTCASES=""
+TESTCASES="${TESTCASES} --testcase tst_partition_001"
+squishrunner-run suite_FEATURE_PARTITION "${TESTCASES}"
+
+TESTCASES=""
+TESTCASES="${TESTCASES} --testcase tst_revolution_001"
+TESTCASES="${TESTCASES} --testcase tst_revolution_003"
+TESTCASES="${TESTCASES} --testcase tst_revolution_004"
+TESTCASES="${TESTCASES} --testcase tst_revolution_005"
+TESTCASES="${TESTCASES} --testcase tst_revolution_006"
+squishrunner-run suite_FEATURE_REVOLUTION "${TESTCASES}"
+
+TESTCASES=""
+#TESTCASES="${TESTCASES} --testcase tst_sketch_001"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_002"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_003"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_004"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_005"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_006"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_007"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_008"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_009"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_010"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_011"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_012"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_013"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_014"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_015"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_016"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_017"
+#TESTCASES="${TESTCASES} --testcase tst_sketch_018"
+#squishrunner-run suite_FEATURE_SKETCH "${TESTCASES}"
 
-squishserver --verbose --port=${SQUISHSERVER_PORT} --stop
+# stop squishserver
+squishserver ${SERVEROPTIONS_ARGS} --verbose --stop
 for aut in linux_run.sh salome_run.sh; do
-  squishserver --config removeAUT ${aut} $(pwd)
+  squishserver --config removeAUT ${aut} ${AUT_DIR}
 done
 
 exit ${RETVAL}