From: eap <eap@opencascade.com>
Date: Thu, 26 Jul 2018 13:35:17 +0000 (+0300)
Subject: Fix the command running the tests
X-Git-Tag: SHAPER_V9_1_0RC1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7fb1662380e6f7b83589c95f397f0289b73f1c3e;p=plugins%2Fgmshplugin.git

Fix the command running the tests
---

diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt
index cd56614..512f6b7 100644
--- a/doc/salome/examples/CMakeLists.txt
+++ b/doc/salome/examples/CMakeLists.txt
@@ -24,6 +24,8 @@
 INCLUDE(examples.set)
 
 SET(COMPONENT_NAME GMSHPLUGIN)
+SET(SALOME_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/salome_test_driver.py")
+SET(TIMEOUT        300)
 
 SET(TEST_INSTALL_DIRECTORY ${SALOME_GMSHPLUGIN_INSTALL_TESTS})
 
@@ -33,7 +35,7 @@ SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
 FOREACH(tfile ${EXAMPLE_NAMES})
   SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
   ADD_TEST(NAME ${TEST_NAME}
-           COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/doc/salome/examples/gmshdemo.py ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+           COMMAND ${PYTHON_EXECUTABLE} -B ${SALOME_TEST_DRIVER} ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}")
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
   INSTALL(FILES ${tfile}.py DESTINATION ${SALOME_INSTALL_DOC}/examples/GMSHPLUGIN)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b4916b5..240ec65 100755
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -20,6 +20,8 @@
 INCLUDE(tests.set)
 
 SET(COMPONENT_NAME GMSHPLUGIN)
+SET(SALOME_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/salome_test_driver.py")
+SET(TIMEOUT        300)
 
 SET(TEST_INSTALL_DIRECTORY ${SALOME_GMSHPLUGIN_INSTALL_TESTS})
 
@@ -29,7 +31,7 @@ SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
 FOREACH(tfile ${TEST_NAMES})
   SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
   ADD_TEST(NAME ${TEST_NAME}
-           COMMAND ${PYTHON_EXECUTABLE} -B ${CMAKE_SOURCE_DIR}/doc/salome/examples/gmshdemo.py ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+           COMMAND ${PYTHON_EXECUTABLE} -B ${SALOME_TEST_DRIVER} ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES ENVIRONMENT "${tests_env}")
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()