# GENERATION OF THE TEST SUITE (DUMP)
# Dump all files with the selected extension inside the input directory
+# technically opj_dump should simply parse these one, since syntax is ok.
+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
+ issue165.jp2
+ #edf_c2_1103421.jp2
+ edf_c2_1178956.jp2
+ edf_c2_1000290.jp2
+ #edf_c2_1000691.jp2 # ok
+ #edf_c2_20.jp2 #looks ok as per kdu_jp2info
+ edf_c2_1377017.jp2
+ edf_c2_1002767.jp2
+ #edf_c2_10025.jp2
+ edf_c2_1000234.jp2
+ edf_c2_225881.jp2
+ edf_c2_1000671.jp2
+ #edf_c2_1013627.jp2 # weird box, but kdu_jp2info ok
+ edf_c2_1015644.jp2
+ edf_c2_101463.jp2
+ edf_c2_1674177.jp2
+ edf_c2_1673169.jp2
+ issue429.jp2
+ )
+
# Define a list of file which should be gracefully rejected:
set(BLACKLIST_JPEG2000
+ ${BLACKLIST_JPEG2000_TMP}
broken.jp2
broken2.jp2
broken3.jp2
gdal_fuzzer_check_comp_dx_dy.jp2
gdal_fuzzer_check_number_of_tiles.jp2
gdal_fuzzer_unchecked_numresolutions.jp2
+ mem-b2ace68c-1381.jp2
+ 1851.pdf.SIGSEGV.ce9.948.jp2
+ 1888.pdf.asan.35.988.jp2
+ issue362-2863.jp2 #kdu_jp2info ok
+ issue362-2866.jp2
+ issue362-2894.jp2
+ issue400.jp2 #kdu_jp2info ok
+ issue364-38.jp2
+ issue364-903.jp2 #kdu_jp2info ok
+ issue393.jp2 #kdu_jp2info ok
+ issue408.jp2 #kdu_jp2info ok
+ issue420.jp2 #kdu_jp2info ok
)
file(GLOB_RECURSE OPJ_DATA_NR_LIST
"${INPUT_NR}/*.j2k"
"${INPUT_NR}/*.j2c"
"${INPUT_NR}/*.jp2"
+ "${INPUT_NR}/*.jpc"
#"${INPUT_NR}/*.jpx"
)
foreach(INPUT_FILENAME ${OPJ_DATA_NR_LIST})
get_filename_component(INPUT_FILENAME_NAME ${INPUT_FILENAME} NAME)
- get_filename_component(INPUT_FILENAME_NAME_WE ${INPUT_FILENAME_NAME} NAME_WE)
+ #get_filename_component(INPUT_FILENAME_NAME_WE ${INPUT_FILENAME_NAME} NAME_WE)
+ # cannot use longest extension function, since some name contains multiples
+ # dots. Instead write out own shortest extension function:
+ string(FIND ${INPUT_FILENAME_NAME} "." SHORTEST_EXT_POS REVERSE)
+ string(SUBSTRING ${INPUT_FILENAME_NAME} 0 ${SHORTEST_EXT_POS} INPUT_FILENAME_NAME_WE)
string(REGEX MATCH ${INPUT_FILENAME_NAME} bad_jpeg2000 ${BLACKLIST_JPEG2000})
# Dump the input image
endif()
+set(nonregression_filenames_used)
# Parse the command line found in the file(s)
set(IT_TEST_ENC 0)
set(IT_TEST_DEC 0)
#-----
# Now we can add the test suite corresponding to a line command in the file
#-----
-
# ENCODER TEST SUITE
if(ENC_TEST_FOUND)
math(EXPR IT_TEST_ENC "${IT_TEST_ENC}+1" )
# 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
)
# DECODER TEST SUITE
else()
+ string(FIND ${INPUT_FILENAME} "nonregression" nr_pos)
+ if(${nr_pos} GREATER 0)
+ list(APPEND nonregression_filenames_used ${INPUT_FILENAME_NAME})
+ endif()
math(EXPR IT_TEST_DEC "${IT_TEST_DEC}+1" )
# Decode the input image
# if not failed, check against registered md5:
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}
endif()
endforeach()
+
+set(existing_filenames)
+foreach(f ${OPJ_DATA_NR_LIST})
+ get_filename_component(ff ${f} NAME)
+ list(APPEND existing_filenames ${ff})
+endforeach()
+if(existing_filenames)
+list(REMOVE_ITEM existing_filenames ${nonregression_filenames_used})
+endif()
+
+# keep track of new addition:
+# if we reach here, then a J2K files was added but no test is present in
+# test_suite.ctest.in:
+foreach(found_but_no_test ${existing_filenames})
+ add_test(NAME Found-But-No-Test-${found_but_no_test} COMMAND ${CMAKE_COMMAND} -E echo "${found_but_no_test}")
+ set_tests_properties(Found-But-No-Test-${found_but_no_test} PROPERTIES WILL_FAIL TRUE)
+endforeach()