X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=test%2FVisuPrs%2F2D_viewer%2FCMakeLists.txt;h=2f71ff372e9352a4f4c4399c16a5ddf61035247c;hb=866822387420d8da61654fcabf49a9e51308c507;hp=0c9b9d82f1be322eff478f519df10142bbf2085a;hpb=c7c9039d845fb2a5e2eb391139af089b4bed26a5;p=modules%2Fparavis.git

diff --git a/test/VisuPrs/2D_viewer/CMakeLists.txt b/test/VisuPrs/2D_viewer/CMakeLists.txt
index 0c9b9d82..2f71ff37 100644
--- a/test/VisuPrs/2D_viewer/CMakeLists.txt
+++ b/test/VisuPrs/2D_viewer/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2010-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2014  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,13 +17,15 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(2DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
-    SET_TESTS_PROPERTIES(2DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+IF(SALOME_PARAVIS_ALL_TEST)
+  SET(TEST_NAMES A0 A1)
+ELSE()
+  SET(TEST_NAMES A0)
+ENDIF()
+  
+FOREACH(tfile ${TEST_NAMES})
+  ADD_TEST(2DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PARAVIS_TEST_HELPER_FILE}
+                    ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(2DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(2DVIEWER_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") 
+ENDFOREACH()