walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Properly close bug #73, by providing a test for it.

This commit is contained in:
Mathieu Malaterre 2011-08-22 13:13:00 +00:00
parent c025f363f5
commit ef258914b2
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/conformance/CMakeLists.txt
View File

@ -481,4 +481,4 @@ FOREACH(numFileP1 RANGE 1 7)
PROPERTIES DEPENDS PROPERTIES DEPENDS
NR-${filenameInput}-dump) NR-${filenameInput}-dump)
ENDFOREACH(numFileP1 RANGE 1 7) ENDFOREACH(numFileP1 RANGE 1 7)

56
tests/nonregression/CMakeLists.txt
View File

@ -12,32 +12,46 @@ FILE(GLOB_RECURSE OPJ_DATA_NR_LIST
"${INPUT_NR}/*.jp2" "${INPUT_NR}/*.jp2"
) )
# Define a list of file which should be gracefully rejected:
SET(BLACKLIST_JPEG200
illegalcolortransform.j2k
)
FOREACH(filepath ${OPJ_DATA_NR_LIST}) FOREACH(filepath ${OPJ_DATA_NR_LIST})
GET_FILENAME_COMPONENT(filename ${filepath} NAME) GET_FILENAME_COMPONENT(filename ${filepath} NAME)
GET_FILENAME_COMPONENT(filenameSub ${filename} NAME_WE) GET_FILENAME_COMPONENT(filenameSub ${filename} NAME_WE)
STRING(REGEX MATCH ${filename} bad_jpeg2000 ${BLACKLIST_JPEG200})
ADD_TEST(NR-${filename}-dump ADD_TEST(NR-${filename}-dump
${EXECUTABLE_OUTPUT_PATH}/j2k_dump ${EXECUTABLE_OUTPUT_PATH}/j2k_dump
-i ${filepath} -i ${filepath}
-o ${TEMP}/${filename}.txt -o ${TEMP}/${filename}.txt
) )
ADD_TEST(NR-${filename}-compare_dump2base
${EXECUTABLE_OUTPUT_PATH}/compare_dump_files
-b ${BASELINE_NR}/opj_${filenameSub}.txt
-t ${TEMP}/${filename}.txt
)
SET_TESTS_PROPERTIES(NR-${filename}-compare_dump2base
PROPERTIES DEPENDS
NR-${filename}-dump)
ADD_TEST(NR-${filename}-decode ADD_TEST(NR-${filename}-decode
${EXECUTABLE_OUTPUT_PATH}/j2k_to_image ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image
-i ${filepath} -i ${filepath}
-o ${TEMP}/${filename}.pgx -o ${TEMP}/${filename}.pgx
)
IF(bad_jpeg2000)
SET_TESTS_PROPERTIES(NR-${filename}-dump
PROPERTIES WILL_FAIL TRUE)
SET_TESTS_PROPERTIES(NR-${filename}-decode
PROPERTIES WILL_FAIL TRUE)
ELSE(bad_jpeg2000)
# Only run this test when previous succeeds
ADD_TEST(NR-${filename}-compare_dump2base
${EXECUTABLE_OUTPUT_PATH}/compare_dump_files
-b ${BASELINE_NR}/opj_${filenameSub}.txt
-t ${TEMP}/${filename}.txt
) )
SET_TESTS_PROPERTIES(NR-${filename}-compare_dump2base
PROPERTIES DEPENDS
NR-${filename}-dump)
ENDIF(bad_jpeg2000)
# ADD_TEST(NR-${filename}-compare2base # ADD_TEST(NR-${filename}-compare2base
# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages # ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
# -b ${BASELINE_NR}/opj_${filenameRef} # -b ${BASELINE_NR}/opj_${filenameRef}
@ -51,4 +65,4 @@ FOREACH(filepath ${OPJ_DATA_NR_LIST})
# PROPERTIES DEPENDS # PROPERTIES DEPENDS
# NR-${filename}-decode) # NR-${filename}-decode)
ENDFOREACH(filepath) ENDFOREACH(filepath)