[trunk] fix error about the way to detect the additional test suite

diff --git a/CHANGES b/CHANGES
index 33a592f9d5b511744707201d7a3e3487fe484870..a372c2b8e3d74604dff2d277fa76d049f4067fde 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@ November 30, 2011
            - change types related to index in stream to OPJ_OFF_T, thus resolving to a 64 bit signed integer
            - change types related to size of stream to OPJ_UINT64_T
            - change calls to fseek/ftell to LFS-capable OPJ_SEEK/OPJ_TELL
+* [mickael] fix error about the way to detect the additional test suite
 
 November 29, 2011
 * [mickael] fix error with new way to detect kdu_expand

diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt
index 4589ddfcc84717c6df487915f13a4effd5a586c2..966a198d3e16c6cf88ddd482719050fc7cc912d4 100644 (file)
--- a/tests/nonregression/CMakeLists.txt
+++ b/tests/nonregression/CMakeLists.txt
@@ -95,7 +95,8 @@ IF (TEST_SUITE_FILES)
     
     # Avoid to process the official test suite
     SET(FILE_ALREADY_READ 0)
-    STRING(REGEX MATCH "test_suite.ctest.in$" FILE_ALREADY_READ ${TEST_SUITE_FILE})
+    GET_FILENAME_COMPONENT(TEST_SUITE_FILENAME ${TEST_SUITE_FILE} NAME)
+    STRING(REGEX MATCH "^test_suite.ctest.in$" FILE_ALREADY_READ ${TEST_SUITE_FILENAME})
    
     IF(NOT FILE_ALREADY_READ) 
       # Configure the additional test suite file: