Improve scripts for Linux

diff --git a/test_squish.sh b/test_squish.sh
index 14bef5609bef7908e432a535194bf083358fd032..673effe9f187a3e33561f234ea318197b4847c0f 100755 (executable)
--- a/test_squish.sh
+++ b/test_squish.sh
@@ -9,22 +9,24 @@
 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"
+SQUISHRUNNER_ARGS="${SQUISHRUNNER_ARGS} --resultdir ${SOURCES_DIR}/test.squish_results"
+SQUISHRUNNER_ARGS="${SQUISHRUNNER_ARGS} --reportgen xmljunit"
+SQUISHRUNNER_ARGS="${SQUISHRUNNER_ARGS} --exitCodeOnFail 1"
 
 RETVAL=0
 
@@ -40,17 +42,17 @@ 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_STANDALONE ${TESTCASES}
+squishrunner ${SERVEROPTIONS_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_STANDALONE ${TESTCASES} ${SQUISHRUNNER_ARGS}
 EXIT_CODE=$?
 if [ ${EXIT_CODE} = '1' ]; then RETVAL=1; fi
 
 TESTCASES=""
 TESTCASES="${TESTCASES} --testcase tst_474"
-#TESTCASES="${TESTCASES} --testcase tst_532"
-#TESTCASES="${TESTCASES} --testcase tst_576"
-#TESTCASES="${TESTCASES} --testcase tst_679"
-#TESTCASES="${TESTCASES} --testcase tst_903"
-squishrunner ${SQUISHRUNNER_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_ISSUES_SALOME ${TESTCASES}
+TESTCASES="${TESTCASES} --testcase tst_532"
+TESTCASES="${TESTCASES} --testcase tst_576"
+TESTCASES="${TESTCASES} --testcase tst_679"
+TESTCASES="${TESTCASES} --testcase tst_903"
+squishrunner ${SERVEROPTIONS_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_ISSUES_SALOME ${TESTCASES} ${SQUISHRUNNER_ARGS}
 EXIT_CODE=$?
 if [ ${EXIT_CODE} = '1' ]; then RETVAL=1; fi
 
@@ -58,13 +60,13 @@ TESTCASES=""
 #TESTCASES="${TESTCASES} --testcase tst_boolean_001"
 #TESTCASES="${TESTCASES} --testcase tst_boolean_002"
 #TESTCASES="${TESTCASES} --testcase tst_boolean_003"
-#squishrunner ${SQUISHRUNNER_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_FEATURE_BOOLEAN ${TESTCASES}
+#squishrunner ${SERVEROPTIONS_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_FEATURE_BOOLEAN ${TESTCASES} ${SQUISHRUNNER_ARGS}
 EXIT_CODE=$?
 if [ ${EXIT_CODE} = '1' ]; then RETVAL=1; fi
 
 TESTCASES=""
 #TESTCASES="${TESTCASES} --testcase tst_construction_001"
-#squishrunner ${SQUISHRUNNER_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_FEATURE_CONSTRUCTION ${TESTCASES}
+#squishrunner ${SERVEROPTIONS_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_FEATURE_CONSTRUCTION ${TESTCASES} ${SQUISHRUNNER_ARGS}
 EXIT_CODE=$?
 if [ ${EXIT_CODE} = '1' ]; then RETVAL=1; fi
 
@@ -74,13 +76,13 @@ TESTCASES=""
 #TESTCASES="${TESTCASES} --testcase tst_extrusion_003"
 #TESTCASES="${TESTCASES} --testcase tst_extrusion_004"
 #TESTCASES="${TESTCASES} --testcase tst_extrusion_006"
-#squishrunner ${SQUISHRUNNER_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_FEATURE_EXTRUSION ${TESTCASES}
+#squishrunner ${SERVEROPTIONS_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_FEATURE_EXTRUSION ${TESTCASES} ${SQUISHRUNNER_ARGS}
 EXIT_CODE=$?
 if [ ${EXIT_CODE} = '1' ]; then RETVAL=1; fi
 
 TESTCASES=""
 #TESTCASES="${TESTCASES} --testcase tst_partition_001"
-#squishrunner ${SQUISHRUNNER_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_FEATURE_PARTITION ${TESTCASES}
+#squishrunner ${SERVEROPTIONS_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_FEATURE_PARTITION ${TESTCASES} ${SQUISHRUNNER_ARGS}
 EXIT_CODE=$?
 if [ ${EXIT_CODE} = '1' ]; then RETVAL=1; fi
 
@@ -90,7 +92,7 @@ TESTCASES=""
 #TESTCASES="${TESTCASES} --testcase tst_revolution_004"
 #TESTCASES="${TESTCASES} --testcase tst_revolution_005"
 #TESTCASES="${TESTCASES} --testcase tst_revolution_006"
-#squishrunner ${SQUISHRUNNER_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_FEATURE_REVOLUTION ${TESTCASES}
+#squishrunner ${SERVEROPTIONS_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_FEATURE_REVOLUTION ${TESTCASES} ${SQUISHRUNNER_ARGS}
 EXIT_CODE=$?
 if [ ${EXIT_CODE} = '1' ]; then RETVAL=1; fi
 
@@ -113,12 +115,12 @@ TESTCASES=""
 #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_FEATURE_SKETCH ${TESTCASES}
+#squishrunner ${SERVEROPTIONS_ARGS} --testsuite ${SOURCES_DIR}/test.squish/suite_FEATURE_SKETCH ${TESTCASES} ${SQUISHRUNNER_ARGS}
 EXIT_CODE=$?
 if [ ${EXIT_CODE} = '1' ]; then RETVAL=1; fi
 
 # 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