Update ParaVis non-regression test base in the following ways:

[modules/paravis.git] / test / VisuPrs / CMakeLists.txt

diff --git a/test/VisuPrs/CMakeLists.txt b/test/VisuPrs/CMakeLists.txt
index d52cb03c807d751bb57366c7c627b2bc7da12b31..0791257f00a6b5f752ad4531fede13bf9e29a3df 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
 #
 
-SET(TIMEOUT 10000)
+# For make test
+
+SET(TIMEOUT 1000)
 SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
 
 IF(NOT WIN32)
@@ -28,9 +30,11 @@ IF(NOT WIN32)
   STRING(REGEX REPLACE ";/" "\\\\;/" tests_env "${tests_env}")
 ENDIF(NOT WIN32)
 
-SET(PARAVIS_TEST_HELPER_FILE ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py)
+SET(SALOME_TEST_DRIVER "${KERNEL_ROOT_DIR}/bin/salome/appliskel/salome_test_driver.py")
+
+# Common part
 
-SET(TEST_DIRECTORIES 
+SET(TEST_DIRECTORIES
   Util
   2D_viewer
   3D_viewer
@@ -47,14 +51,20 @@ SET(TEST_DIRECTORIES
   GaussPoints
   StreamLines
   SWIG_scripts
-  Tables
+# Tables          table reader is not used anymore and CSVReader 
+#                 doesn't suport txt and xls formats, so switch off Tables tests
   ImportMedField
   united
   bugs
   imps
   dump_study
 )
-  
+
 FOREACH(test_dir ${TEST_DIRECTORIES})
   ADD_SUBDIRECTORY(${test_dir})
 ENDFOREACH()
+
+# Application tests
+INSTALL(FILES CTestTestfileInstall.cmake
+  DESTINATION ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/VisuPrs
+  RENAME CTestTestfile.cmake)