CMake:

- modify test system for PARAVIS module

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4cc1f0f248b6bf4d8a3335f33033f6ba73690b8b..7dc45d411aa6381812b7c5490d4d48d08db8b3df 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -20,20 +20,19 @@
 ADD_SUBDIRECTORY(VisuPrs)
 
 SET(_demo_files
-  demo_0_med.py
-  demo_1_med.py
-  demo_2_med.py
-  demo_3_med.py
-  demo_4_med.py
-  demo_5_med.py
-  demo_6_med.py
-  demo_7_med.py
-  demo_8_med.py
-  demo_9_med.py
-  demo_10_med.py
-  demo_11_med.py
-  demo_12_med.py
-  demo_13_med.py
+  demo0.py
+  demo1.py
+  demo2.py
+  demo3.py
+  demo4.py
+  demo5.py
+  demo6.py
+  demo7.py
+  demo8.py
+  demo9.py
+  demo10.py
+  demo11.py
+  demo12.py
   demo_14_med.py
   demo_15_med.py
   )

diff --git a/test/VisuPrs/CMakeLists.txt b/test/VisuPrs/CMakeLists.txt
index 7e48950e294a1097780bf07d847a1cbc7d879139..65f5249404ba7b581830859790a2b3854b9befde 100644 (file)
--- a/test/VisuPrs/CMakeLists.txt
+++ b/test/VisuPrs/CMakeLists.txt
@@ -17,7 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_SUBDIRECTORY(
+SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
+
+SET(TEST_DIRECTORIES 
   Util
   2D_viewer
   3D_viewer
@@ -41,3 +43,7 @@ ADD_SUBDIRECTORY(
   imps
   dump_study
 )
+
+FOREACH(test_dir ${TEST_DIRECTORIES})
+  ADD_SUBDIRECTORY(${test_dir})
+ENDFOREACH()

diff --git a/test/VisuPrs/Util/CMakeLists.txt b/test/VisuPrs/Util/CMakeLists.txt
index ccb68ec88e95b7667f9fadea05aac8284f36074e..73c593e0dd8f45f481b7c6d6cba599824f799ee9 100644 (file)
--- a/test/VisuPrs/Util/CMakeLists.txt
+++ b/test/VisuPrs/Util/CMakeLists.txt
@@ -22,13 +22,4 @@ SET(dist_testscript_DATA
   paravistesthelper.py
   )
 
-FOREACH(f ${dist_testscript_DATA})
-  INSTALL(FILES ${f} DESTINATION bin/salome)
-
-  INSTALL(CODE "SET(PYTHON_FILE ${f})")
-  INSTALL(CODE "SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})")
-  INSTALL(CODE "SET(DEST bin/salome)")
-  INSTALL(CODE "SET(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})")
-  INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/install_and_compile_python_file.cmake)
-  
-ENDFOREACH(f ${dist_testscript_DATA})
+SALOME_INSTALL_SCRIPTS("${dist_testscript_DATA}" ${SALOME_INSTALL_SCRIPT_SCRIPTS})