Make salome_run.sh use Squish preferences only if environment contains SALOME_SQUISH_...

diff --git a/env_squish.sh b/env_squish.sh
index a321cccc0f84a490504ba9c7d14f17fe2a7a47f3..27849205868a0ef1eafc1c628ef5aefa004a7113 100644 (file)
--- a/env_squish.sh
+++ b/env_squish.sh
@@ -7,3 +7,5 @@ export PATH=${SQUISH_DIR}/bin:${PATH}
 
 export SQUISH_LICENSEKEY_DIR=/dn23/NEWGEOM/NEWGEOM_JENKINS_BUILD_AREA/tools
 export HOME=$(pwd)/HOME
+
+export SALOME_SQUISH_PREFS=TRUE

diff --git a/salome_run.sh b/salome_run.sh
index b7bda749c976193d30730934195965336707fea1..5984410f1559f4ca1ab2cdc8c47478241e860ef3 100755 (executable)
--- a/salome_run.sh
+++ b/salome_run.sh
@@ -12,7 +12,9 @@ if [ -f .salomeport ]; then
 fi 
 
 SALOME_ARGS=""
-SALOME_ARGS="${SALOME_ARGS} -r ${SOURCES_DIR}/test.squish/shared/testdata/SalomeApp.xml"
+if [[ "${SALOME_SQUISH_PREFS:-FALSE}" == "TRUE" ]]; then
+  SALOME_ARGS="${SALOME_ARGS} -r ${SOURCES_DIR}/test.squish/shared/testdata/SalomeApp.xml"
+fi
 SALOME_ARGS="${SALOME_ARGS} --ns-port-log=$(pwd)/.salomeport"
 
 ${KERNEL_ROOT_DIR}/bin/salome/runSalome.py ${SALOME_ARGS} >log_runSalome 2>err_runSalome