X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=tests%2Fnonregression%2FCMakeLists.txt;h=05fce40ce271430ac476561b48be81afe7af8e3c;hb=67c998fd8dcf7c2276680fab5e508c724ca45e52;hp=53cdc9f420fbe0502e4f6ddf8928d9bcd12f673b;hpb=6609719b409be038c2d41765b64e42f7b92f79cb;p=openjpeg.git diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt index 53cdc9f4..05fce40c 100644 --- a/tests/nonregression/CMakeLists.txt +++ b/tests/nonregression/CMakeLists.txt @@ -34,7 +34,6 @@ set(BLACKLIST_JPEG2000_TMP 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 @@ -51,6 +50,7 @@ set(BLACKLIST_JPEG2000_TMP issue427-null-image-size.jp2 issue427-illegal-tile-offset.jp2 issue495.jp2 + issue820.jp2 ) # Define a list of file which should be gracefully rejected: @@ -60,6 +60,7 @@ set(BLACKLIST_JPEG2000 broken2.jp2 broken3.jp2 broken4.jp2 + edf_c2_20.jp2 #may look ok as per kdu_jp2info, but inspection it reveals that the transformation value is out of range gdal_fuzzer_assert_in_opj_j2k_read_SQcd_SQcc.patch.jp2 gdal_fuzzer_check_comp_dx_dy.jp2 gdal_fuzzer_check_number_of_tiles.jp2 @@ -78,9 +79,12 @@ set(BLACKLIST_JPEG2000 issue420.jp2 #kdu_jp2info ok 27ac957758a35d00d6765a0c86350d9c.SIGFPE.d25.537.jpc #kdu_jp2info crash 3672da2f1f67bbecad27d7181b4e9d7c.SIGFPE.d25.805.jpc #kdu_jp2info crash - issue476.jp2 #kdu_jp2info ok issue475.jp2 #kdu_jp2info ok issue413.jp2 #kdu_jp2info ok + issue823.jp2 #kdu_jp2info ok + issue826.jp2 #inspection reveales that the transformation value is out of range + oss-fuzz2785.jp2 #inspection reveales that the transformation value is out of range + issue1438.j2k ) file(GLOB_RECURSE OPJ_DATA_NR_LIST @@ -88,6 +92,8 @@ file(GLOB_RECURSE OPJ_DATA_NR_LIST "${INPUT_NR}/*.j2c" "${INPUT_NR}/*.jp2" "${INPUT_NR}/*.jpc" + "${INPUT_NR}/*.jph" + "${INPUT_NR}/*.jhc" #"${INPUT_NR}/*.jpx" ) @@ -231,11 +237,13 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) else () # Check if the first argument is equal to opj_compress - string(REGEX MATCH "^opj_compress$|^opj_decompress$" EXE_NAME_FOUND ${EXE_NAME}) + string(REGEX MATCH "^opj_compress$|^opj_compress_no_raw$|^opj_compress_no_raw_lossless$|^opj_decompress$" EXE_NAME_FOUND ${EXE_NAME}) if(EXE_NAME_FOUND) - string(REGEX MATCH "opj_compress" ENC_TEST_FOUND ${EXE_NAME}) + string(REGEX MATCH "^opj_compress$|^opj_compress_no_raw$|^opj_compress_no_raw_lossless$" ENC_TEST_FOUND ${EXE_NAME}) + string(REGEX MATCH "^opj_compress_no_raw$|^opj_compress_no_raw_lossless$" NO_RAW ${EXE_NAME}) + string(REGEX MATCH "opj_compress_no_raw_lossless" LOSSLESS ${EXE_NAME}) else() @@ -245,6 +253,32 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) list(REMOVE_AT CMD_ARG_LIST 0) + if(ENC_TEST_FOUND) + + # Parse lines like opj_compress lossy-check { -n 3 -m 0:0:0 -p 0:0:0 } ... + set(LOSSY_CHECK_ARG_LIST "") + list(GET CMD_ARG_LIST 0 NEXT_ARG) + string(REGEX MATCH "^lossy-check$" LOSSY_CHECK ${NEXT_ARG}) + if(LOSSY_CHECK) + list(REMOVE_AT CMD_ARG_LIST 0) + list(GET CMD_ARG_LIST 0 NEXT_ARG) + string(REGEX MATCH "^{$" FOUND_OPEN_CURL ${NEXT_ARG}) + if(NOT FOUND_OPEN_CURL) + message( FATAL_ERROR "'{' expected after lossy-check") + endif() + list(REMOVE_AT CMD_ARG_LIST 0) + while(TRUE) + list(GET CMD_ARG_LIST 0 NEXT_ARG) + list(REMOVE_AT CMD_ARG_LIST 0) + string(REGEX MATCH "^}$" FOUND_CLOSE_CURL ${NEXT_ARG}) + if(FOUND_CLOSE_CURL) + break() + endif() + list (APPEND LOSSY_CHECK_ARG_LIST ${NEXT_ARG}) + endwhile() + endif() + endif() + endif () # Parse the argument list to find the input filename and output filename @@ -317,8 +351,32 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) PROPERTIES DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-dump) + if(LOSSY_CHECK) + add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref + COMMAND opj_decompress + -i ${OUTPUT_FILENAME} + -o ${OUTPUT_FILENAME}.tif + ) + + set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref + PROPERTIES DEPENDS + NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode) + + # Compare the decoding file with original one, using tolerance + add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-compare_dec-ref-out2base + COMMAND compare_images + -b ${INPUT_FILENAME} + -t ${OUTPUT_FILENAME}.tif + -s bXtY + ${LOSSY_CHECK_ARG_LIST} + ) + + set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-compare_dec-ref-out2base + PROPERTIES DEPENDS + NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref) + # Decode the encoding file with kakadu expand command - if (KDU_EXPAND_EXECUTABLE) + elseif (KDU_EXPAND_EXECUTABLE) add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref COMMAND ${KDU_EXPAND_EXECUTABLE} -i ${OUTPUT_FILENAME} @@ -329,17 +387,18 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) PROPERTIES DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode) - # 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 compare_raw_files - -b ${BASELINE_NR}/opj_${OUTPUT_FILENAME_NAME_WE}-ENC-${IT_TEST_ENC}.raw - -t ${OUTPUT_FILENAME}.raw - ) - - set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-compare_dec-ref-out2base - PROPERTIES DEPENDS - NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref) + if(NOT NO_RAW) + # 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 compare_raw_files + -b ${BASELINE_NR}/opj_${OUTPUT_FILENAME_NAME_WE}-ENC-${IT_TEST_ENC}.raw + -t ${OUTPUT_FILENAME}.raw + ) + set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-compare_dec-ref-out2base + PROPERTIES DEPENDS + NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref) + endif() endif() # Test the encoded file is a valid JP2 file @@ -358,7 +417,7 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) # If lossless compression (simple test is 4 arguments), decompress & compare list(LENGTH CMD_ARG_LIST_2 ARG_COUNT) - if (ARG_COUNT EQUAL 4) + if ((ARG_COUNT EQUAL 4) OR LOSSLESS) # can we compare with the input image ? if (${INPUT_FILENAME_NAME} MATCHES "\\.tif$") add_test(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode