diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | tests/nonregression/CMakeLists.txt | 17 |
2 files changed, 13 insertions, 7 deletions
@@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +November 9, 2011 ++ [jmalik] add some sanity check in CMakeLists to prevent STRING(REGEX..) call issues + November 8, 2011 + [mickael] WIP: add get_decoded_tile functionality + [mickael] WIP: clean and enhance j2K file diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt index 7cb65d3b..ec100e42 100644 --- a/tests/nonregression/CMakeLists.txt +++ b/tests/nonregression/CMakeLists.txt @@ -124,21 +124,24 @@ ENDIF(TEST_SUITE_FILES) SET(IT_TEST_ENC 0) SET(IT_TEST_DEC 0) FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) - + SET(IGNORE_LINE_FOUND 0) # Replace space by ; to generate a list STRING(REPLACE " " ";" CMD_ARG_LIST ${OPJ_TEST_CMD_LINE}) - + # Check if the first argument begin by the comment sign LIST(GET CMD_ARG_LIST 0 EXE_NAME) - STRING(REGEX MATCH "^#" IGNORE_LINE_FOUND ${EXE_NAME}) - - IF(IGNORE_LINE_FOUND) + + IF(EXE_NAME) + STRING(REGEX MATCH "^#" IGNORE_LINE_FOUND ${EXE_NAME}) + ENDIF(EXE_NAME) + + IF(IGNORE_LINE_FOUND OR NOT EXE_NAME) #MESSAGE( STATUS "Current line is ignored: ${OPJ_TEST_CMD_LINE}") - ELSE(IGNORE_LINE_FOUND) + ELSE(IGNORE_LINE_FOUND OR NOT EXE_NAME) # Check if the first argument begin by the failed sign SET(FAILED_TEST_FOUND 0) @@ -330,7 +333,7 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) ENDIF(ENC_TEST_FOUND) - ENDIF(IGNORE_LINE_FOUND) + ENDIF(IGNORE_LINE_FOUND OR NOT EXE_NAME) ENDFOREACH(OPJ_TEST_CMD_LINE) |