From 563b56e09c1b3545894c8210bbf295a1ff5aad1e Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Wed, 30 Nov 2011 17:31:42 +0000 Subject: [PATCH] [trunk] fix error about the way to detect the additional test suite --- CHANGES | 1 + tests/nonregression/CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 33a592f9..a372c2b8 100644 --- 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 4589ddfc..966a198d 100644 --- 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: