diff options
| author | Julien Malik <julien.malik@paraiso.me> | 2016-05-02 16:03:16 +0200 |
|---|---|---|
| committer | Julien Malik <julien.malik@paraiso.me> | 2016-05-02 16:05:41 +0200 |
| commit | 17a0a8a195a9aad76a6bdb174edc8aa5fb8b7831 (patch) | |
| tree | 73afe14427af5b3b7b65633f04a1b86128b54144 /tests | |
| parent | ba0cf122f6820d38a7a5acc65b9d64392dd94e83 (diff) | |
Use lowercase for cmake commands consistenly
Inspired from https://github.com/InsightSoftwareConsortium/ITK/blob/master/Utilities/Maintenance/HowToCreateTheCMakeCaseConversion.txt
This needs vim 7.3 and fails with vim 7.4
This also fixes a number of :
- missing empty line at end of files
- useless space at end of lines
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/nonregression/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | tests/nonregression/checkmd5refs.cmake | 4 | ||||
| -rw-r--r-- | tests/unit/CMakeLists.txt | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt index 40283169..31af7c05 100644 --- a/tests/nonregression/CMakeLists.txt +++ b/tests/nonregression/CMakeLists.txt @@ -55,7 +55,7 @@ set(BLACKLIST_JPEG2000_TMP # Define a list of file which should be gracefully rejected: set(BLACKLIST_JPEG2000 ${BLACKLIST_JPEG2000_TMP} - broken1.jp2 + broken1.jp2 broken2.jp2 broken3.jp2 broken4.jp2 @@ -340,7 +340,7 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref) endif() - + # Test the encoded file is a valid JP2 file if (JPYLYZER_EXECUTABLE) if (${OUTPUT_FILENAME} MATCHES "\\.jp2$") @@ -348,13 +348,13 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) COMMAND ${JPYLYZER_EXECUTABLE} ${OUTPUT_FILENAME} ) - set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-jpylyser PROPERTIES + set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-jpylyser PROPERTIES DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode PASS_REGULAR_EXPRESSION "<isValidJP2>True</isValidJP2>" ) endif() endif(JPYLYZER_EXECUTABLE) - + # If lossless compression (simple test is 4 arguments), decompress & compare list(LENGTH CMD_ARG_LIST_2 ARG_COUNT) if (ARG_COUNT EQUAL 4) @@ -363,13 +363,13 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode COMMAND opj_decompress -i ${OUTPUT_FILENAME} -o ${OUTPUT_FILENAME}.lossless.tif ) - set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode PROPERTIES + set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode PROPERTIES DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode ) add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-compare COMMAND compare_images -b ${INPUT_FILENAME} -t ${OUTPUT_FILENAME}.lossless.tif -n 1 -d ) - set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-compare PROPERTIES + set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-compare PROPERTIES DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode ) endif() @@ -401,7 +401,7 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) -DOUTFILENAME:STRING=${OUTPUT_FILENAME} -P ${CMAKE_CURRENT_SOURCE_DIR}/checkmd5refs.cmake) - set_tests_properties(NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode-md5 + set_tests_properties(NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode-md5 PROPERTIES DEPENDS NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode ) diff --git a/tests/nonregression/checkmd5refs.cmake b/tests/nonregression/checkmd5refs.cmake index 40e019b7..75afbed0 100644 --- a/tests/nonregression/checkmd5refs.cmake +++ b/tests/nonregression/checkmd5refs.cmake @@ -43,11 +43,11 @@ file(READ ${REFFILE} variable) foreach(pgxfullpath ${globfiles}) file(MD5 ${pgxfullpath} output) get_filename_component(pgxfile ${pgxfullpath} NAME) - + string(REGEX MATCH "[0-9a-f]+ ${pgxfile}" output_var "${variable}") set(output "${output} ${pgxfile}") - + if("${output_var}" STREQUAL "${output}") message(STATUS "equal: [${output_var}] vs [${output}]") else() diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index ae47b88e..772b1a30 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -1,4 +1,4 @@ -# UNIT TESTS +# UNIT TESTS include_directories( ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h |