From 4c705259a4e1b0a14dffb0338764df0c8d472a6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Aguerre?= Date: Thu, 14 Apr 2016 18:42:08 +0200 Subject: [PATCH] [salome test] Update list of tests --- src/Plugins/MEDReader/Test/CTestTestfileInstall.cmake | 8 +++----- test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake | 2 +- test/VisuPrs/bugs/CTestTestfileInstall.cmake | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Plugins/MEDReader/Test/CTestTestfileInstall.cmake b/src/Plugins/MEDReader/Test/CTestTestfileInstall.cmake index ea816efb..c71da75d 100644 --- a/src/Plugins/MEDReader/Test/CTestTestfileInstall.cmake +++ b/src/Plugins/MEDReader/Test/CTestTestfileInstall.cmake @@ -17,16 +17,14 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(SALOME_TEST_DRIVER "$ENV{ABSOLUTE_APPLI_PATH}/bin/salome/appliskel/salome_test_driver.py") SET(COMPONENT_NAME MEDREADER) -SET(TIMEOUT 30) +SET(TIMEOUT 60) -SET(TEST_NUMBERS 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18) +SET(TEST_NUMBERS 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20) set(BASELINES_DIR "Baselines") FOREACH(tfile ${TEST_NUMBERS}) SET(TEST_NAME MEDREADER_${tfile}) ADD_TEST(${TEST_NAME} python testMEDReader${tfile}.py -B ${BASELINES_DIR}) - #ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} testMEDReader${tfile}.py -B ${BASELINES_DIR}) - SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}") + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT}) ENDFOREACH() diff --git a/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake b/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake index 68d2d970..8606b76b 100644 --- a/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake +++ b/test/VisuPrs/IsoSurfaces/CTestTestfileInstall.cmake @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 +SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A8 A9 B0 B1 B2 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 F1 F2 F3 F4 F5 F6 F7 F8 F9 G0 G1 G2) FOREACH(tfile ${TEST_NAMES}) diff --git a/test/VisuPrs/bugs/CTestTestfileInstall.cmake b/test/VisuPrs/bugs/CTestTestfileInstall.cmake index 994b289f..7d4ccb8a 100644 --- a/test/VisuPrs/bugs/CTestTestfileInstall.cmake +++ b/test/VisuPrs/bugs/CTestTestfileInstall.cmake @@ -17,8 +17,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A9 B1 C3 C5 C6 C8 C9 - D1 D3 D5 D6 D7 E0) +SET(TEST_NAMES A0 A1 A2 A3 A4 A5 A6 A7 A9 B1 C3 C5 C6 C9 + D1 D3 D6 D7 E0) FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME ${COMPONENT_NAME}_BUGS_${tfile}) -- 2.39.2