X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=test_squish.sh;h=6efa84ba3d0c802fc7dde6ea2a1b4d3c62a3e8e5;hb=7e01af6cfeb76252b3fd062f6a2f35115994a422;hp=ac29d492133e346d546e031a0fdcb06f95aa49f4;hpb=bea28b9a4826d0b611c747f6230972987cf0ec83;p=modules%2Fshaper.git

diff --git a/test_squish.sh b/test_squish.sh
index ac29d4921..6efa84ba3 100755
--- a/test_squish.sh
+++ b/test_squish.sh
@@ -9,25 +9,39 @@
 export TEST_DATA_DIR=${SOURCES_DIR}/test.squish/shared/testdata
 export SQUISH_GRABWINDOW_CLASSES=AppElements_ViewPort,OCCViewer_ViewPort3d
 
+SERVEROPTIONS_ARGS="${SERVEROPTIONS_ARGS} --port=${SQUISH_PORT}"
+
 # config squishserver
 for aut in linux_run.sh salome_run.sh; do
   squishserver --config addAUT ${aut} ${AUT_DIR}
 done
 squishserver --config setAUTTimeout 120
 # stop previous version
-squishserver --verbose --port=${SQUISH_PORT} --stop
+squishserver ${SERVEROPTIONS_ARGS} --verbose --stop >/dev/null 2>&1
 # start squishserver
-squishserver --verbose --port=${SQUISH_PORT} 1>log_squishserver 2>err_squishserver &
+squishserver ${SERVEROPTIONS_ARGS} --verbose 1>log_squishserver 2>err_squishserver &
 
 # config squishrunner
 squishrunner --port=${SQUISH_PORT} --config setCursorAnimation off
 # start squishrunner
-SQUISHRUNNER_ARGS="${SQUISHRUNNER_ARGS} --port=${SQUISH_PORT}"
-#SQUISHRUNNER_ARGS="${SQUISHRUNNER_ARGS} --reportgen stdout"
-#SQUISHRUNNER_ARGS="${SQUISHRUNNER_ARGS} --exitCodeOnFail 1"
 
 RETVAL=0
 
+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=$?
+  if [ ${EXIT_CODE} = '1' ]; then RETVAL=1; fi
+}
+
 TESTCASES=""
 TESTCASES="${TESTCASES} --testcase tst_BASE"
 TESTCASES="${TESTCASES} --testcase tst_PARALLEL_1"
@@ -40,31 +54,57 @@ TESTCASES="${TESTCASES} --testcase tst_common_1"
 TESTCASES="${TESTCASES} --testcase tst_crash_1"
 TESTCASES="${TESTCASES} --testcase tst_DISTANCE"
 TESTCASES="${TESTCASES} --testcase tst_RADIUS"
-squishrunner ${SQUISHRUNNER_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_ISSUES ${TESTCASES}
-EXIT_CODE=$?
-if [ ${EXIT_CODE} = '1' ]; then RETVAL=1; fi
+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"
-#TESTCASES="${TESTCASES} --testcase tst_576"
-#TESTCASES="${TESTCASES} --testcase tst_679"
-#TESTCASES="${TESTCASES} --testcase tst_903"
+#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"
-#TESTCASES="${TESTCASES} --testcase tst_extrusion_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"
@@ -83,12 +123,10 @@ TESTCASES="${TESTCASES} --testcase tst_474"
 #TESTCASES="${TESTCASES} --testcase tst_sketch_016"
 #TESTCASES="${TESTCASES} --testcase tst_sketch_017"
 #TESTCASES="${TESTCASES} --testcase tst_sketch_018"
-squishrunner ${SQUISHRUNNER_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_ISSUES_SALOME ${TESTCASES}
-EXIT_CODE=$?
-if [ ${EXIT_CODE} = '1' ]; then RETVAL=1; fi
+#squishrunner-run suite_FEATURE_SKETCH "${TESTCASES}"
 
 # stop squishserver
-squishserver --verbose --port=${SQUISH_PORT} --stop
+squishserver ${SERVEROPTIONS_ARGS} --verbose --stop
 for aut in linux_run.sh salome_run.sh; do
   squishserver --config removeAUT ${aut} ${AUT_DIR}
 done