From ae56a5ed7f640a944108b5aee567bb80ced86c9a Mon Sep 17 00:00:00 2001 From: spo Date: Wed, 12 Aug 2015 14:25:45 +0300 Subject: [PATCH] Add SALOME test --- README | 2 +- eclipse.sh | 29 ++++------------ eclipse_centos.sh | 3 -- eclipse_d6.sh | 3 -- eclipse_d8.sh | 3 -- env.sh | 22 +++++++++++++ linux_env.sh => env_linux.sh | 28 ++++------------ env_salome.sh | 10 ++++++ env_squish.sh | 6 ++++ env_standalone.sh | 9 +++++ launcher_env.sh | 33 +++---------------- linux_run.sh | 14 ++------ linux_run_centos.sh | 3 -- linux_run_d6.sh | 3 -- make.sh | 25 ++++---------- make_centos.sh | 3 -- make_d6.sh | 3 -- salome_env.sh | 15 +++++---- salome_kill.sh | 18 +++------- salome_kill_centos.sh | 3 -- salome_kill_d6.sh | 3 -- salome_run.sh | 22 +++++-------- salome_run_centos.sh | 3 -- salome_run_d6.sh | 3 -- squishide_run.sh | 4 +++ squishserver_run.sh | 4 +++ squishserver_stop.sh | 4 +++ test.sh | 24 +++----------- test.squish/suite_ISSUES_SALOME/envvars | 0 test.squish/suite_ISSUES_SALOME/objects.map | 16 +++++++++ test.squish/suite_ISSUES_SALOME/suite.conf | 10 ++++++ .../suite_ISSUES_SALOME/tst_BASE/test.py | 19 +++++++++++ test_centos.sh | 3 -- test_d6.sh | 3 -- 34 files changed, 157 insertions(+), 196 deletions(-) delete mode 100755 eclipse_centos.sh delete mode 100755 eclipse_d6.sh delete mode 100755 eclipse_d8.sh create mode 100644 env.sh rename linux_env.sh => env_linux.sh (65%) create mode 100644 env_salome.sh create mode 100644 env_squish.sh create mode 100644 env_standalone.sh delete mode 100755 linux_run_centos.sh delete mode 100755 linux_run_d6.sh delete mode 100755 make_centos.sh delete mode 100755 make_d6.sh delete mode 100755 salome_kill_centos.sh delete mode 100755 salome_kill_d6.sh delete mode 100755 salome_run_centos.sh delete mode 100755 salome_run_d6.sh create mode 100755 squishide_run.sh create mode 100755 squishserver_run.sh create mode 100755 squishserver_stop.sh create mode 100644 test.squish/suite_ISSUES_SALOME/envvars create mode 100644 test.squish/suite_ISSUES_SALOME/objects.map create mode 100644 test.squish/suite_ISSUES_SALOME/suite.conf create mode 100644 test.squish/suite_ISSUES_SALOME/tst_BASE/test.py delete mode 100755 test_centos.sh delete mode 100755 test_d6.sh diff --git a/README b/README index 3d1cd0ec8..7f5d89a2b 100644 --- a/README +++ b/README @@ -6,7 +6,7 @@ Compilation on LINUX: cd 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 8a7bbfed7..1bb2803d3 100755 --- 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 index af0926eb2..000000000 --- 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 index 9c297f17b..000000000 --- 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 index c61f556b6..000000000 --- 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 index 000000000..6282b1a85 --- /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/linux_env.sh b/env_linux.sh similarity index 65% rename from linux_env.sh rename to env_linux.sh index 721071a37..69ff2a646 100644 --- a/linux_env.sh +++ b/env_linux.sh @@ -1,21 +1,11 @@ #!/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 +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 @@ -37,13 +27,9 @@ 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 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 index 000000000..3cd5e495a --- /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 index 000000000..6d3b59246 --- /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 index 000000000..02f9932ed --- /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 34ed0c903..5946a9693 100755 --- 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_run.sh b/linux_run.sh index d6f768320..b8968cc17 100755 --- 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 index 15735a19f..000000000 --- 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 index 4655910fa..000000000 --- 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 f4a94002e..d076d44e1 100755 --- 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 index f38c2c6f7..000000000 --- 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 index 320139a69..000000000 --- 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 ae918e290..c94a7e665 100644 --- 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 da9b7eec6..da53b608e 100755 --- 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 index ecc8dfcef..000000000 --- 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 index 627a2395e..000000000 --- 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 726ead4d1..16c6caf0a 100755 --- 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 index fedf04501..000000000 --- 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 index d00238fd4..000000000 --- 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 index 000000000..5f3922959 --- /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 index 000000000..04f2147cb --- /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 index 000000000..b90b9fdd5 --- /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 96464a286..7f2d98e45 100755 --- 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 index 000000000..e69de29bb diff --git a/test.squish/suite_ISSUES_SALOME/objects.map b/test.squish/suite_ISSUES_SALOME/objects.map new file mode 100644 index 000000000..d676f5443 --- /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 index 000000000..57f573da2 --- /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 index 000000000..2d6594702 --- /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 index 2efd8b90e..000000000 --- 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 index da6c624bc..000000000 --- a/test_d6.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -test.sh d6 -- 2.39.2