X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=salome_run.sh;h=dcbb707ceb93079b9d4aaabce511c874d0bc2731;hb=6e71f6c49f075cb3d8e60c0a116ba9567c4316c0;hp=ddb38bb5daf00cef78a0c5780ced41e81d77882e;hpb=fc33424bb806c86eb577beb3ab1fa20ed87b5c9a;p=modules%2Fshaper.git

diff --git a/salome_run.sh b/salome_run.sh
index ddb38bb5d..dcbb707ce 100755
--- a/salome_run.sh
+++ b/salome_run.sh
@@ -1,18 +1,8 @@
-#!/bin/bash -x
+#!/bin/bash
 
-a_dir=$(dirname $0)
+source env.sh
 
-cd ${a_dir}
-
-source ${a_dir}/env.sh
-source ${a_dir}/env_salome.sh
-
-SALOME_ARGS="-r ./test.squish/shared/testdata/SalomeApp.xml"
-if [ -f GDB ]; then
-  echo "No --gdb-session"
-  #SALOME_ARGS="${SALOME_ARGS} --gdb-session"
-fi
-SALOME_ARGS="${SALOME_ARGS} --ns-port-log=$(pwd)/.salomeport"
+${TOOLS_DIR}/solver.sh "$@"
 
 # kill processes of previous SALOME run
 if [ -f .salomeport ]; then
@@ -22,43 +12,16 @@ if [ -f .salomeport ]; then
   rm .salomeport
 fi 
 
-${KERNEL_ROOT_DIR}/bin/salome/runSalome.py ${SALOME_ARGS} >log_runSalome 2>err_runSalome &
-SALOME_PID=$!
-
-ATTEMPT=0
-while [[ -f .salomeport && ${ATTEMPT} -lt 5 ]]; do
-  sleep 5
-  SALOME_PORT=$(cat .salomeport)
-  ATTEMPT=$[${ATTEMPT}+1]
-done 
-if [ ${ATTEMPT} = 5 ]; then 
-  echo "Can not receive SALOME_PORT: file .salomeport does not exist..."
-  exit 1
-fi
-
-echo "SALOME_PORT ${SALOME_PORT}"
-
-if [ -f GDB ]; then
-  SALOME_SESSION_SERVER_PID="$(salome_pid.py ${SALOME_PORT} 'SALOME_Session_Server' 2>/dev/null)"
-  ATTEMPT=0
-  while [[ "${SALOME_SESSION_SERVER_PID}" = "" && "${ATTEMPT}" -lt 5 ]]; do
-    sleep 5
-    SALOME_SESSION_SERVER_PID="$(salome_pid.py ${SALOME_PORT} 'SALOME_Session_Server' 2>/dev/null)"
-    ATTEMPT=$[${ATTEMPT}+1]
-  done
-  if [ ${ATTEMPT} = 5 ]; then 
-    echo "Can not receive SALOME_SESSION_SERVER_PID..."
-    exit 2
-  fi
-
-  echo "SALOME_SESSION_SERVER_PID ${SALOME_SESSION_SERVER_PID}"
-  echo "Connecting GDB to PID ${SALOME_SESSION_SERVER_PID}..."
-  gdb - ${SALOME_SESSION_SERVER_PID} >>log_gdb_salome 2>>err_gdb_salome
+SALOME_ARGS=""
+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"
 
-wait ${SALOME_PID}
+${KERNEL_ROOT_DIR}/bin/salome/runSalome.py ${SALOME_ARGS} >log_runSalome 2>err_runSalome
 
-echo "Kill SALOME on port ${SALOME_PORT}"
-${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py ${SALOME_PORT}
-pkill -f "omniNames -start ${SALOME_PORT}"
+#SALOME_PORT=$(cat .salomeport)
+#echo "Kill SALOME on port ${SALOME_PORT}"
+#${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py ${SALOME_PORT}
+#pkill -f "omniNames -start ${SALOME_PORT}"