bos #28736 Prevent running HOMARD-related tests in case if MEDFile is built with...

diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt
index 54215c734e02e3078b9b797b00bdf062c17e281c..59575ec1ea776ae02400320a550032154b3f1cf3 100644 (file)
--- a/doc/salome/examples/CMakeLists.txt
+++ b/doc/salome/examples/CMakeLists.txt
@@ -20,7 +20,10 @@
 INCLUDE(tests.set)
 
 SET(TEST_REINIT_SALOME "False")
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test)
+
 SALOME_CONFIGURE_FILE(tests.py.in tests.py)
+SALOME_CONFIGURE_FILE(CTestTestfileInstall.cmake ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CTestTestfile.cmake INSTALL ${TEST_INSTALL_DIRECTORY})
 
 SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
 
@@ -40,12 +43,7 @@ SALOME_INSTALL_SCRIPTS("${EXAMPLES_TESTS}" ${SALOME_INSTALL_DOC}/examples/SMESH)
 
 # Application tests
 
-SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test)
 INSTALL(FILES ${GOOD_TESTS} ${BAD_TESTS} ${SESSION_FREE_TESTS} DESTINATION ${TEST_INSTALL_DIRECTORY})
 INSTALL(FILES Mesh_tri.med test_homard_adapt.med tutorial_4.00.med tutorial_4.xao tutorial_5.00.med tutorial_5.fr.med DESTINATION ${TEST_INSTALL_DIRECTORY})
-
-INSTALL(FILES CTestTestfileInstall.cmake
-        DESTINATION ${TEST_INSTALL_DIRECTORY}
-        RENAME CTestTestfile.cmake)
 INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY})
 INSTALL(DIRECTORY MGAdapt_med_files DESTINATION ${TEST_INSTALL_DIRECTORY})

diff --git a/doc/salome/examples/CTestTestfileInstall.cmake b/doc/salome/examples/CTestTestfileInstall.cmake
index cf70be839e82dde96307f937de4c0687f771108d..b32790848aa413e4e718e3a773b2f18c729b64b1 100644 (file)
--- a/doc/salome/examples/CTestTestfileInstall.cmake
+++ b/doc/salome/examples/CTestTestfileInstall.cmake
@@ -17,12 +17,13 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(tests.set)
-
+SET(MED_INT_IS_LONG @MED_INT_IS_LONG@)
 SET(PYTHON_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/python_test_driver.py")
 SET(COMPONENT_NAME SMESH)
 SET(TIMEOUT        300)
 
+INCLUDE(tests.set)
+
 FOREACH(tfile ${GOOD_TESTS} ${BAD_TESTS})
   GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)
   SET(TEST_NAME SMESH_${BASE_NAME})

diff --git a/doc/salome/examples/tests.set b/doc/salome/examples/tests.set
index bf759ea134cdf2b987fe5ed6e0ff1296fd3ad93c..6c2a12a1d11669f213cda08577f5ff17eec8cd2b 100644 (file)
--- a/doc/salome/examples/tests.set
+++ b/doc/salome/examples/tests.set
@@ -56,10 +56,14 @@ SET(BAD_TESTS
 IF(NOT WIN32)
   LIST(APPEND BAD_TESTS
     MGAdaptTests_without_session.py
-    test_homard_adapt.py
-    test_uniform_refinement.py
     test_smeshplugin_mg_tetra_parallele.py
   )
+  IF(MED_INT_IS_LONG)
+    LIST(APPEND BAD_TESTS
+      test_homard_adapt.py
+      test_uniform_refinement.py
+    )
+  ENDIF(MED_INT_IS_LONG)
 ENDIF(NOT WIN32)
 
 SET(GOOD_TESTS