From a07aeeb4d99e71471fef0283a8d4d8eb1541fa34 Mon Sep 17 00:00:00 2001 From: spo Date: Wed, 23 Dec 2015 10:50:34 +0300 Subject: [PATCH] Make salome_run.sh use Squish preferences only if environment contains SALOME_SQUISH_PREFS=TRUE --- env_squish.sh | 2 ++ salome_run.sh | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/env_squish.sh b/env_squish.sh index a321cccc0..278492058 100644 --- 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 b7bda749c..5984410f1 100755 --- 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 -- 2.39.2