Add SALOME test

diff --git a/README b/README
index 3d1cd0ec8be2850c860e6ce29c6ce72d9ae9c6a8..7f5d89a2b0f62935dfc56fca59a9b20b11b5e3dc 100644 (file)
--- a/README
+++ b/README
@@ -6,7 +6,7 @@ Compilation on LINUX:
 
   cd <sources_directory>
   source salome_env.sh
-  source linux_env.sh
+  source env_linux.sh
   cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=${ROOT_DIR}/install ${ROOT_DIR}/sources
   make
   make install

diff --git a/eclipse.sh b/eclipse.sh
index 8a7bbfed78904c9bc77ee6d9fe63891e84ccbcf5..1bb2803d3f44bf1400639e1fe5b2fbe744583cab 100755 (executable)
--- a/eclipse.sh
+++ b/eclipse.sh
@@ -1,34 +1,19 @@
 #!/bin/bash
 
-# Find absolute path to ROOT_DIR
-export ROOT_DIR=$(pwd)/..
-export ROOT_DIR=`cd "${ROOT_DIR}";pwd`
+source env.sh
+source env_standalone.sh
 
-SRC_DIR=${ROOT_DIR}/sources
-
-BUILD_DIR=build
-INSTALL_DIR=install
-if [ $1 ]; then
-  BUILD_DIR=${BUILD_DIR}-$1
-  INSTALL_DIR=${INSTALL_DIR}-$1
-fi
-
-source ${SRC_DIR}/salome_env.sh
-source ${SRC_DIR}/linux_env.sh $1
-mkdir -p ${ROOT_DIR}/${BUILD_DIR}
-cd ${ROOT_DIR}/${BUILD_DIR}
-
-export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}
-export LightAppConfig=${ROOT_DIR}/${INSTALL_DIR}/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui
+mkdir -p ${BUILD_DIR}
+cd ${BUILD_DIR}
 
 CMAKE_ARGS="-D_ECLIPSE_VERSION=4.3"
 CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Debug"
 CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=ON"
-CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${ROOT_DIR}/${INSTALL_DIR}"
+CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR}"
 CMAKE_ARGS="${CMAKE_ARGS} -DPYTHON_EXECUTABLE=${PYTHONHOME}/bin/python"
 CMAKE_ARGS="${CMAKE_ARGS} -DUSE_TEST_COVERAGE=OFF"
-CMAKE_ARGS="${CMAKE_ARGS} ${SRC_DIR}"
+CMAKE_ARGS="${CMAKE_ARGS} ${SOURCES_DIR}"
 
 cmake -G "Eclipse CDT4 - Unix Makefiles" ${CMAKE_ARGS}
 
-/misc/dn48/newgeom/common/eclipse-4.4.0/eclipse&
+/dn48/newgeom/common/eclipse-4.4.0/eclipse&

diff --git a/eclipse_centos.sh b/eclipse_centos.sh
deleted file mode 100755 (executable)
index af0926e..0000000
--- a/eclipse_centos.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-eclipse.sh centos

diff --git a/eclipse_d6.sh b/eclipse_d6.sh
deleted file mode 100755 (executable)
index 9c297f1..0000000
--- a/eclipse_d6.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-eclipse.sh d6

diff --git a/eclipse_d8.sh b/eclipse_d8.sh
deleted file mode 100755 (executable)
index c61f556..0000000
--- a/eclipse_d8.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-eclipse.sh d8

diff --git a/env.sh b/env.sh
new file mode 100644 (file)
index 0000000..6282b1a
--- /dev/null
+++ b/env.sh
@@ -0,0 +1,22 @@
+#!/bin/bash -x
+
+set -o nounset
+
+PLATFORM=""
+if [ -f PLATFORM ]; then
+PLATFORM="$(lsb_release -is)"
+RELEASE="$(lsb_release -rs)"
+if [ "${PLATFORM}" = 'CentOS' ]; then PLATFORM=-centos
+elif [ "${PLATFORM}" = 'Debian' ]; then
+  if [ "${RELEASE}" = '8.0' ]; then PLATFORM=-d8
+  else PLATFORM=-d6
+  fi
+fi
+fi
+
+export ROOT_DIR=$(cd $(dirname $0)/.. && pwd)
+export SOURCES_DIR=${ROOT_DIR}/sources
+export BUILD_DIR=${ROOT_DIR}/build${PLATFORM}
+export INSTALL_DIR=${ROOT_DIR}/install${PLATFORM}
+
+export NEWGEOM_PDIR=/dn48/newgeom/common/products

diff --git a/env_linux.sh b/env_linux.sh
new file mode 100644 (file)
index 0000000..69ff2a6
--- /dev/null
+++ b/env_linux.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set +x
+set +u
+echo "Export SALOME from ${INST_ROOT}..."
+source ${INST_ROOT}/env_products.sh
+set -u
+set -x
+
+#------ SolveSpace ------
+export SOLVESPACE_ROOT_DIR=${NEWGEOM_PDIR}/solvespace-2.0
+export LD_LIBRARY_PATH=${SOLVESPACE_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
+##
+
+#------ lcov ------
+export LCOV_ROOT_DIR=${NEWGEOM_PDIR}/lcov-1.11
+export PATH=${LCOV_ROOT_DIR}/bin:${PATH}
+##
+
+#------ OCCT ------
+# Defaults
+export CSF_PluginDefaults=${CAS_ROOT_DIR}/src/StdResource
+export CSF_StandardDefaults=${CAS_ROOT_DIR}/src/StdResource
+# For CMake
+export LIB=${LD_LIBRARY_PATH}
+export PATH=${CASROOT}:${PATH}
+##
+
+#------ NewGEOM ------
+export NEWGEOM_ROOT_DIR=${INSTALL_DIR}
+export PATH=${NEWGEOM_ROOT_DIR}/bin:${NEWGEOM_ROOT_DIR}/plugins:${PATH}
+export PYTHONPATH=${NEWGEOM_ROOT_DIR}/swig:${NEWGEOM_ROOT_DIR}/plugins:${NEWGEOM_ROOT_DIR}/addons:${NEWGEOM_ROOT_DIR}/pythonAPI:${PYTHONPATH}
+export LD_LIBRARY_PATH=${NEWGEOM_ROOT_DIR}/bin:${NEWGEOM_ROOT_DIR}/swig:${NEWGEOM_ROOT_DIR}/plugins:${LD_LIBRARY_PATH}
+export NEW_GEOM_CONFIG_FILE=${NEWGEOM_ROOT_DIR}/plugins
+export NewGeomResources=${NEWGEOM_ROOT_DIR}/resources

diff --git a/env_salome.sh b/env_salome.sh
new file mode 100644 (file)
index 0000000..3cd5e49
--- /dev/null
+++ b/env_salome.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+pushd ${SOURCES_DIR}
+  source salome_env.sh
+  source env_linux.sh
+popd
+
+# Correcting path which defined with error
+export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}
+export SalomeAppConfig=${INSTALL_DIR}/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui

diff --git a/env_squish.sh b/env_squish.sh
new file mode 100644 (file)
index 0000000..6d3b592
--- /dev/null
+++ b/env_squish.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export SQUISH_GRABWINDOW_CLASSES=SVTK_RenderWindowInteractor
+
+SQUISH_DIR=/dn23/NEWGEOM/NEWGEOM_JENKINS_BUILD_AREA/tools/squish-5.1.1-qt48x-linux64
+export PATH=${SQUISH_DIR}/bin:${PATH}

diff --git a/env_standalone.sh b/env_standalone.sh
new file mode 100644 (file)
index 0000000..02f9932
--- /dev/null
+++ b/env_standalone.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+pushd ${SOURCES_DIR}
+  source salome_env.sh
+  source env_linux.sh
+popd
+
+export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}
+export LightAppConfig=${INSTALL_DIR}/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui

diff --git a/launcher_env.sh b/launcher_env.sh
index 34ed0c903bcb0af1a8d271d44bce31f62a7355f4..5946a969390e76db7ec0256bb2062ab0a4d0776d 100755 (executable)
--- a/launcher_env.sh
+++ b/launcher_env.sh
@@ -1,36 +1,11 @@
 #!/bin/bash
 
-# Find absolute path to ROOT_DIR
-export ROOT_DIR=$(pwd)/..
-export ROOT_DIR=`cd "${ROOT_DIR}";pwd`
+source env.sh
+source env_standalone.sh
 
-PLATFORM="$(lsb_release -is)"
-RELEASE="$(lsb_release -rs)"
-if [ "${PLATFORM}" == "CentOS" ]; then PLATFORM=centos
-elif [ "${PLATFORM}" == "Debian" ]; then 
-  if [ "${RELEASE}" == "8.0" ]; then PLATFORM=d8
-  else PLATFORM=d6
-  fi
-fi
-
-SRC_DIR=${ROOT_DIR}/sources
-source ${SRC_DIR}/salome_env.sh
-source ${SRC_DIR}/linux_env.sh ${PLATFORM}
-
-BUILD_DIR=build
-INSTALL_DIR=install
-if [ ${PLATFORM} ]; then
-  BUILD_DIR=${BUILD_DIR}-${PLATFORM}
-  INSTALL_DIR=${INSTALL_DIR}-${PLATFORM}
-fi
-
-mkdir -p ${ROOT_DIR}/${BUILD_DIR}
-cd ${ROOT_DIR}/${BUILD_DIR}
-
-export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}
-export LightAppConfig=${ROOT_DIR}/${INSTALL_DIR}/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui
+cd ${BUILD_DIR}
 
-if [ $@ ]; then
+if [[ -n $@ ]]; then
   $@
 else
   bash

diff --git a/linux_env.sh b/linux_env.sh
deleted file mode 100644 (file)
index 721071a..0000000
--- a/linux_env.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-if [ "${INST_ROOT}" = "" ] ; then
-#    source /dn48/newgeom/common/SALOME/env_products.sh
-  echo "Error: INST_ROOT is not defined."
-  exit 1
-else
-    source ${INST_ROOT}/env_products.sh
-fi
-
-if [ "${NEWGEOM_PDIR}" = "" ] ; then
-    export NEWGEOM_PDIR=/dn48/newgeom/common/products
-fi
-
-if [ "${ROOT_DIR}" = "" ] ; then
-  export ROOT_DIR=$(pwd)/..
-  export ROOT_DIR=`cd "${ROOT_DIR}";pwd`
-fi
-
-#------ SolveSpace ------
-export SOLVESPACE_ROOT_DIR=${NEWGEOM_PDIR}/solvespace-2.0
-export LD_LIBRARY_PATH=${SOLVESPACE_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
-##
-
-#------ lcov ------
-export LCOV_ROOT_DIR=${NEWGEOM_PDIR}/lcov-1.11
-export PATH=${LCOV_ROOT_DIR}/bin:${PATH}
-##
-
-#------ OCCT ------
-# Defaults
-export CSF_PluginDefaults=${CAS_ROOT_DIR}/src/StdResource
-export CSF_StandardDefaults=${CAS_ROOT_DIR}/src/StdResource
-# For CMake
-export LIB=${LD_LIBRARY_PATH}
-export PATH=${CASROOT}:${PATH}
-##
-
-#------ NewGEOM ------
-INSTALL_DIR=install
-if [ $1 ]; then INSTALL_DIR=${INSTALL_DIR}-$1; fi
-
-export NEWGEOM_ROOT_DIR=${ROOT_DIR}/${INSTALL_DIR}
-export PATH=${NEWGEOM_ROOT_DIR}/bin:${NEWGEOM_ROOT_DIR}/plugins:${PATH}
-export PYTHONPATH=${NEWGEOM_ROOT_DIR}/swig:${NEWGEOM_ROOT_DIR}/plugins:${NEWGEOM_ROOT_DIR}/addons:${NEWGEOM_ROOT_DIR}/pythonAPI:${PYTHONPATH}
-export LD_LIBRARY_PATH=${NEWGEOM_ROOT_DIR}/bin:${NEWGEOM_ROOT_DIR}/swig:${NEWGEOM_ROOT_DIR}/plugins:${LD_LIBRARY_PATH}
-export NEW_GEOM_CONFIG_FILE=${NEWGEOM_ROOT_DIR}/plugins
-export NewGeomResources=${NEWGEOM_ROOT_DIR}/resources
-

diff --git a/linux_run.sh b/linux_run.sh
index d6f768320f52594fe25fff7173d516794a991c24..b8968cc17d46949b753c63ed1c085f89c00ca5e5 100755 (executable)
--- a/linux_run.sh
+++ b/linux_run.sh
@@ -1,14 +1,6 @@
 #!/bin/bash
 
-# Find absolute path to ROOT_DIR
-export ROOT_DIR=$(pwd)/..
-export ROOT_DIR=`cd "${ROOT_DIR}";pwd`
+source env.sh
+source env_standalone.sh
 
-SRC_DIR=${ROOT_DIR}/sources
-source ${SRC_DIR}/salome_env.sh
-source ${SRC_DIR}/linux_env.sh $1
-
-INSTALL_DIR=install
-if [ $1 ]; then INSTALL_DIR=${INSTALL_DIR}-$1; fi
-
-${ROOT_DIR}/${INSTALL_DIR}/bin/GeomApp
+${INSTALL_DIR}/bin/GeomApp

diff --git a/linux_run_centos.sh b/linux_run_centos.sh
deleted file mode 100755 (executable)
index 15735a1..0000000
--- a/linux_run_centos.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-linux_run.sh centos

diff --git a/linux_run_d6.sh b/linux_run_d6.sh
deleted file mode 100755 (executable)
index 4655910..0000000
--- a/linux_run_d6.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-linux_run.sh d6

diff --git a/make.sh b/make.sh
index f4a94002e273e05fdf0898d09056867d0295e63a..d076d44e1fe24b4f6cda466f9ece4e2918a48a06 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1,26 +1,15 @@
 #!/bin/bash
 
-# Find absolute path to ROOT_DIR
-export ROOT_DIR=$(pwd)/..
-export ROOT_DIR=`cd "${ROOT_DIR}";pwd`
+source env.sh
+source env_standalone.sh
 
-SRC_DIR=${ROOT_DIR}/sources
-
-BUILD_DIR=build
-INSTALL_DIR=install
-if [ $1 ]; then
-  BUILD_DIR=${BUILD_DIR}-$1
-  INSTALL_DIR=${INSTALL_DIR}-$1
-fi
-
-source ${SRC_DIR}/salome_env.sh
-source ${SRC_DIR}/linux_env.sh $1
-mkdir -p ${ROOT_DIR}/${BUILD_DIR}
-cd ${ROOT_DIR}/${BUILD_DIR}
+mkdir -p ${BUILD_DIR}
+cd ${BUILD_DIR}
 
+CMAKE_ARGS=""
 CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Release"
-CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${ROOT_DIR}/${INSTALL_DIR}"
-CMAKE_ARGS="${CMAKE_ARGS} ${SRC_DIR}"
+CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR}"
+CMAKE_ARGS="${CMAKE_ARGS} ${SOURCES_DIR}"
 
 cmake -G "Unix Makefiles" ${CMAKE_ARGS}
 make -j$(nproc) install

diff --git a/make_centos.sh b/make_centos.sh
deleted file mode 100755 (executable)
index f38c2c6..0000000
--- a/make_centos.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-make.sh centos

diff --git a/make_d6.sh b/make_d6.sh
deleted file mode 100755 (executable)
index 320139a..0000000
--- a/make_d6.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-make.sh d6

diff --git a/salome_env.sh b/salome_env.sh
index ae918e290996a36059a3b53cd44be2b3f618c513..c94a7e66534b704bc4d97df2cb15ab0ded3d594a 100644 (file)
--- a/salome_env.sh
+++ b/salome_env.sh
@@ -4,16 +4,17 @@ main() {
   local salome_version=7.6.0
   local platform="$(lsb_release -is)"
   local release="$(lsb_release -rs)"
-  if [[ ${salome_version} == "7.5.1" ]]; then
-    if   [[ "${platform}" == "CentOS" ]]; then export INST_ROOT=/dn48/newgeom/common/SALOME-7.5.1_CentOS-6.3
-    elif [[ "${platform}" == "Debian" && ${release} =~ ^6 ]]; then export INST_ROOT=/dn23/NEWGEOM/common/SALOME-7.5.1_Debian-6.0_SOURCES
-    elif [[ "${platform}" == "Debian" && ${release} =~ ^8 ]]; then export INST_ROOT=/dn23/NEWGEOM/common/SALOME-7.5.1_Debian-8.0_SOURCES
+  if [[ ${salome_version} = '7.5.1' ]]; then
+    if   [[ "${platform}" = 'CentOS' ]]; then export INST_ROOT=/dn48/newgeom/common/SALOME-7.5.1_CentOS-6.3
+    elif [[ "${platform}" = 'Debian' && ${release} =~ ^6 ]]; then export INST_ROOT=/dn23/NEWGEOM/common/SALOME-7.5.1_Debian-6.0_SOURCES
+    elif [[ "${platform}" = 'Debian' && ${release} =~ ^8 ]]; then export INST_ROOT=/dn23/NEWGEOM/common/SALOME-7.5.1_Debian-8.0_SOURCES
     fi
-  elif [[ ${salome_version} == "7.6.0" ]]; then
-    if [[ "${platform}" == "CentOS" ]]; then export INST_ROOT=/dn23/NEWGEOM/common/SALOME-7.6.0_CentOS-6.3_SOURCES
-    elif [[ "${platform}" == "Debian" && ${release} =~ ^6 ]]; then export INST_ROOT=/dn23/NEWGEOM/common/SALOME-7.6.0_Debian-6.0_SOURCES
+  elif [[ ${salome_version} = '7.6.0' ]]; then
+    if   [[ "${platform}" = 'CentOS' ]]; then export INST_ROOT=/dn23/NEWGEOM/common/SALOME-7.6.0_CentOS-6.3_SOURCES
+    elif [[ "${platform}" = 'Debian' && ${release} =~ ^6 ]]; then export INST_ROOT=/dn23/NEWGEOM/common/SALOME-7.6.0_Debian-6.0_SOURCES
     fi
   fi
 }
 
 main
+

diff --git a/salome_kill.sh b/salome_kill.sh
index da9b7eec65e60fce005205000ee21b696d58f9ad..da53b608e061d0bb5dba169b9a2076294b2ae04a 100755 (executable)
--- a/salome_kill.sh
+++ b/salome_kill.sh
@@ -1,17 +1,7 @@
 #!/bin/bash
 
-export ROOT_DIR=$(pwd)/..
-export ROOT_DIR=`cd "${ROOT_DIR}";pwd`
+source env.sh
+source env_salome.sh
 
-source ${ROOT_DIR}/sources/salome_env.sh
-source ${ROOT_DIR}/sources/linux_env.sh
-
-INSTALL_DIR=install
-if [ $1 ]; then INSTALL_DIR=${INSTALL_DIR}-$1; fi
-
-# Correcting path which defined with error
-export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}
-export SalomeAppConfig=${ROOT_DIR}/${INSTALL_DIR}/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui
-
-${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/envSalome.py"
-${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/killSalome.py"
+#${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/killSalome.py"
+${KERNEL_ROOT_DIR}/bin/salome/killSalome.py

diff --git a/salome_kill_centos.sh b/salome_kill_centos.sh
deleted file mode 100755 (executable)
index ecc8dfc..0000000
--- a/salome_kill_centos.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-salome_kill.sh centos

diff --git a/salome_kill_d6.sh b/salome_kill_d6.sh
deleted file mode 100755 (executable)
index 627a239..0000000
--- a/salome_kill_d6.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-salome_kill.sh d6

diff --git a/salome_run.sh b/salome_run.sh
index 726ead4d1b130f6e3e9189b468e625e48b1a7189..16c6caf0af1744bfd4042a7291578f8b1e1ad9c2 100755 (executable)
--- a/salome_run.sh
+++ b/salome_run.sh
@@ -1,17 +1,11 @@
-#!/bin/bash
+#!/bin/bash -x
 
-export ROOT_DIR=$(pwd)/..
-export ROOT_DIR=`cd "${ROOT_DIR}";pwd`
+export SALOME_PORT=2820
 
-source ${ROOT_DIR}/sources/salome_env.sh
-source ${ROOT_DIR}/sources/linux_env.sh $1
+source env.sh
+source env_salome.sh
 
-INSTALL_DIR=install
-if [ $1 ]; then INSTALL_DIR=${INSTALL_DIR}-$1; fi
-
-# Correcting path which defined with error
-export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}
-export SalomeAppConfig=${ROOT_DIR}/${INSTALL_DIR}/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui
-
-${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/envSalome.py"
-${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/runSalome.py"
+${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py ${SALOME_PORT}
+${KERNEL_ROOT_DIR}/bin/salome/runSalome.py --port ${SALOME_PORT}
+sleep 5
+${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py ${SALOME_PORT}

diff --git a/salome_run_centos.sh b/salome_run_centos.sh
deleted file mode 100755 (executable)
index fedf045..0000000
--- a/salome_run_centos.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-salome_run.sh centos

diff --git a/salome_run_d6.sh b/salome_run_d6.sh
deleted file mode 100755 (executable)
index d00238f..0000000
--- a/salome_run_d6.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-salome_run.sh d6

diff --git a/squishide_run.sh b/squishide_run.sh
new file mode 100755 (executable)
index 0000000..5f39229
--- /dev/null
+++ b/squishide_run.sh
@@ -0,0 +1,4 @@
+#!/bin/bash -x
+
+source env_squish.sh
+squishide

diff --git a/squishserver_run.sh b/squishserver_run.sh
new file mode 100755 (executable)
index 0000000..04f2147
--- /dev/null
+++ b/squishserver_run.sh
@@ -0,0 +1,4 @@
+#!/bin/bash -x
+
+source env_squish.sh
+squishserver --verbose --port=4325 --daemon

diff --git a/squishserver_stop.sh b/squishserver_stop.sh
new file mode 100755 (executable)
index 0000000..b90b9fd
--- /dev/null
+++ b/squishserver_stop.sh
@@ -0,0 +1,4 @@
+#!/bin/bash -x
+
+source env_squish.sh
+squishserver --verbose --port=4325 --stop

diff --git a/test.sh b/test.sh
index 96464a28689a4ec5684131c49747cc3d3b7cc192..7f2d98e452bfdfb54a636a1536987fc19c066c57 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -1,25 +1,9 @@
 #!/bin/bash
 
-# Find absolute path to ROOT_DIR
-export ROOT_DIR=$(pwd)/..
-export ROOT_DIR=`cd "${ROOT_DIR}";pwd`
+source env.sh
+source env_standalone.sh
 
-SRC_DIR=${ROOT_DIR}/sources
-
-BUILD_DIR=build
-INSTALL_DIR=install
-if [ $1 ]; then
-  BUILD_DIR=${BUILD_DIR}-$1
-  INSTALL_DIR=${INSTALL_DIR}-$1
-fi
-
-source ${SRC_DIR}/salome_env.sh
-source ${SRC_DIR}/linux_env.sh $1
-mkdir -p ${ROOT_DIR}/${BUILD_DIR}
-cd ${ROOT_DIR}/${BUILD_DIR}
-
-CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Release"
-CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${ROOT_DIR}/${INSTALL_DIR}"
-CMAKE_ARGS="${CMAKE_ARGS} ${SRC_DIR}"
+mkdir -p ${BUILD_DIR}
+cd ${BUILD_DIR}
 
 ctest --no-compress-output -T Test

diff --git a/test.squish/suite_ISSUES_SALOME/envvars b/test.squish/suite_ISSUES_SALOME/envvars
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test.squish/suite_ISSUES_SALOME/objects.map b/test.squish/suite_ISSUES_SALOME/objects.map
new file mode 100644 (file)
index 0000000..d676f54
--- /dev/null
+++ b/test.squish/suite_ISSUES_SALOME/objects.map
@@ -0,0 +1,16 @@
+:Activate module.New_QPushButton       {text='New' type='QPushButton' unnamed='1' visible='1' window=':Activate module_LightApp_ModuleDlg'}
+:Activate module_LightApp_ModuleDlg    {type='LightApp_ModuleDlg' unnamed='1' visible='1' windowTitle='Activate module'}
+:Close active study.Close w/o saving_QPushButton       {text='Close w/o saving' type='QPushButton' unnamed='1' visible='1' window=':Close active study_SUIT_MessageBox'}
+:Close active study_SUIT_MessageBox    {type='SUIT_MessageBox' unnamed='1' visible='1' windowTitle='Close active study'}
+:Exit.Ok_QPushButton   {text='Ok' type='QPushButton' unnamed='1' visible='1' window=':Exit_SalomeApp_ExitDlg'}
+:Exit.Shutdown servers_QCheckBox       {text='Shutdown servers' type='QCheckBox' unnamed='1' visible='1' window=':Exit_SalomeApp_ExitDlg'}
+:Exit_SalomeApp_ExitDlg        {type='SalomeApp_ExitDlg' unnamed='1' visible='1' windowTitle='Exit'}
+:SALOME 7.6.0 - [Study1].3D View Operations_OCCViewer_ViewPort3d       {aboveWidget=':SALOME 7.6.0 - [Study1].3D View Operations_QtxToolBar' type='OCCViewer_ViewPort3d' unnamed='1' visible='1' window=':SALOME 7.6.0 - [Study1]_STD_TabDesktop'}
+:SALOME 7.6.0 - [Study1].3D View Operations_QtxToolBar {name='OCCViewer3DViewOperations' type='QtxToolBar' visible='1' window=':SALOME 7.6.0 - [Study1]_STD_TabDesktop' windowTitle='3D View Operations'}
+:SALOME 7.6.0 - [Study1].Circle_QToolButton    {text='Circle' type='QToolButton' unnamed='1' visible='1' window=':SALOME 7.6.0 - [Study1]_STD_TabDesktop'}
+:SALOME 7.6.0 - [Study1].Sketch_QToolButton    {text='Sketch' type='QToolButton' unnamed='1' visible='1' window=':SALOME 7.6.0 - [Study1]_STD_TabDesktop'}
+:SALOME 7.6.0 - [Study1]_QToolButton   {occurrence='16' type='QToolButton' unnamed='1' visible='1' window=':SALOME 7.6.0 - [Study1]_STD_TabDesktop'}
+:SALOME 7.6.0 - [Study1]_STD_TabDesktop        {type='STD_TabDesktop' unnamed='1' visible='1' windowTitle='SALOME 7.6.0 - [Study1]'}
+:SALOME 7.6.0.Geometry_QToolButton     {text='Geometry' type='QToolButton' unnamed='1' visible='1' window=':SALOME 7.6.0_STD_TabDesktop'}
+:SALOME 7.6.0.NewGeom_QToolButton      {text='NewGeom' type='QToolButton' unnamed='1' visible='1' window=':SALOME 7.6.0_STD_TabDesktop'}
+:SALOME 7.6.0_STD_TabDesktop   {type='STD_TabDesktop' unnamed='1' visible='1' windowTitle='SALOME 7.6.0'}

diff --git a/test.squish/suite_ISSUES_SALOME/suite.conf b/test.squish/suite_ISSUES_SALOME/suite.conf
new file mode 100644 (file)
index 0000000..57f573d
--- /dev/null
+++ b/test.squish/suite_ISSUES_SALOME/suite.conf
@@ -0,0 +1,10 @@
+AUT=salome_run.sh
+CWD=/misc/dn48/newgeom/spo/sources
+ENVVARS=envvars
+HOOK_SUB_PROCESSES=true
+IMPLICITAUTSTART=0
+LANGUAGE=Python
+OBJECTMAP=objects.map
+TEST_CASES=tst_BASE
+VERSION=3
+WRAPPERS=Qt

diff --git a/test.squish/suite_ISSUES_SALOME/tst_BASE/test.py b/test.squish/suite_ISSUES_SALOME/tst_BASE/test.py
new file mode 100644 (file)
index 0000000..2d65947
--- /dev/null
+++ b/test.squish/suite_ISSUES_SALOME/tst_BASE/test.py
@@ -0,0 +1,19 @@
+def main():
+    startApplication("salome_run.sh")
+    
+    clickButton(waitForObject(":SALOME 7.6.0.NewGeom_QToolButton"))
+    clickButton(waitForObject(":Activate module.New_QPushButton"))
+    clickButton(waitForObject(":SALOME 7.6.0 - [Study1].Sketch_QToolButton"))
+    mouseClick(waitForObject(":SALOME 7.6.0 - [Study1].3D View Operations_OCCViewer_ViewPort3d"), 437, 318, 0, Qt.LeftButton)
+    clickButton(waitForObject(":SALOME 7.6.0 - [Study1].Circle_QToolButton"))
+    mouseClick(waitForObject(":SALOME 7.6.0 - [Study1].3D View Operations_OCCViewer_ViewPort3d"), 384, 278, 0, Qt.LeftButton)
+    sendEvent("QMouseEvent", waitForObject(":SALOME 7.6.0 - [Study1].3D View Operations_OCCViewer_ViewPort3d"), QEvent.MouseButtonPress, 556, 381, Qt.LeftButton, 1, 0)
+    sendEvent("QMouseEvent", waitForObject(":SALOME 7.6.0 - [Study1].3D View Operations_OCCViewer_ViewPort3d"), QEvent.MouseButtonRelease, 556, 381, Qt.LeftButton, 0, 0)
+    clickButton(waitForObject(":SALOME 7.6.0 - [Study1].Circle_QToolButton"))
+    clickButton(waitForObject(":SALOME 7.6.0 - [Study1]_QToolButton"))
+  
+    sendEvent("QCloseEvent", waitForObject(":SALOME 7.6.0 - [Study1]_STD_TabDesktop"))
+    clickButton(waitForObject(":Exit.Shutdown servers_QCheckBox"))
+    sendEvent("QMoveEvent", waitForObject(":Exit_SalomeApp_ExitDlg"), 502, 326, 1265, 44)
+    clickButton(waitForObject(":Exit.Ok_QPushButton"))
+    clickButton(waitForObject(":Close active study.Close w/o saving_QPushButton"))

diff --git a/test_centos.sh b/test_centos.sh
deleted file mode 100755 (executable)
index 2efd8b9..0000000
--- a/test_centos.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-test.sh centos

diff --git a/test_d6.sh b/test_d6.sh
deleted file mode 100755 (executable)
index da6c624..0000000
--- a/test_d6.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-test.sh d6