[trunk] Cleanup commit. Rename compare family since comparePGX now support TIFF.

[openjpeg.git] / tests / nonregression / CMakeLists.txt

diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt
index f756fe81b44c7b15e276b20d2a4951c5b122efa0..f21a090844acc7b080ebc690fcea53ab78ab1cf4 100644 (file)
--- a/tests/nonregression/CMakeLists.txt
+++ b/tests/nonregression/CMakeLists.txt
@@ -23,6 +23,8 @@ set(BLACKLIST_JPEG2000_TMP
     2539.pdf.SIGFPE.706.1712.jp2
     0290cb77c5df21828fa74cf2ab2c84d8.SIGFPE.d25.31.jp2
     26ccf3651020967f7778238ef5af08af.SIGFPE.d25.527.jp2
+    4035.pdf.SIGSEGV.d8b.3375.jp2
+    3635.pdf.asan.77.2930.jp2
    )
 
 # Define a list of file which should be gracefully rejected:
@@ -287,7 +289,7 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
 
             # Compare the decoding file with baseline generated from the kdu_expand and baseline.j2k
             add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-compare_dec-ref-out2base
-              COMMAND compareRAWimages
+              COMMAND compare_raw_files
               -b ${BASELINE_NR}/opj_${OUTPUT_FILENAME_NAME_WE}-ENC-${IT_TEST_ENC}.raw
               -t ${OUTPUT_FILENAME}.raw
             )
@@ -318,13 +320,17 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
         add_test(NAME NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode-md5 COMMAND ${CMAKE_COMMAND}
           -DREFFILE:STRING=${CMAKE_CURRENT_SOURCE_DIR}/md5refs.txt
           -DFILENAME:STRING=${INPUT_FILENAME_NAME}
+          -DOUTFILENAME:STRING=${OUTPUT_FILENAME}
           -P ${CMAKE_CURRENT_SOURCE_DIR}/checkmd5refs.cmake)
 
+        set_tests_properties(NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode-md5 
+          PROPERTIES DEPENDS NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode
+        )
 
 # FIXME: add a compare2base function base on raw which
 # can output png diff files if necesary
 #  add_test(NR-${filename}-compare2base
-#      ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
+#      ${EXECUTABLE_OUTPUT_PATH}/compare_images
 #     -b ${BASELINE_NR}/opj_${filenameRef}
 #     -t ${TEMP}/${filename}.pgx
 #     -n ${nbComponents}