[1.5] Use new add_test signature to handle cross compilation and execution using wine
This commit is contained in:
parent
b42f76cb7f
commit
d2be8c5d21
|
@ -51,7 +51,7 @@ IF(BUILD_JPIP)
|
|||
SET(s "${JPIP_SERVER}?target=16.jp2&fsiz=170,170&cnew=http&type=jpp-stream")
|
||||
SET(p "${CMAKE_CURRENT_BINARY_DIR}/jpip.dat")
|
||||
SET(md5 "62b00c620fb0a600c5ffd413cada4674")
|
||||
ADD_TEST(TestJPIP1 ${CMAKE_COMMAND} -DD_URL:STRING=${s} -DD_FILE:PATH=${p}
|
||||
ADD_TEST(NAME TestJPIP1 COMMAND ${CMAKE_COMMAND} -DD_URL:STRING=${s} -DD_FILE:PATH=${p}
|
||||
-DEXPECTED_MD5=${md5} -P ${PROJECT_SOURCE_DIR}/CMake/JPIPTestDriver.cmake)
|
||||
ENDIF(JPIP_SERVER)
|
||||
ENDIF(BUILD_JPIP)
|
||||
|
|
|
@ -56,15 +56,15 @@ IF(ignore_test_value EQUAL 0)
|
|||
get_filename_component(filenameRefSub ${filenameRef} NAME_WE)
|
||||
#r = 0
|
||||
|
||||
ADD_TEST(ETS-C0P0-${filenameInput}-r0-decode
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_to_image
|
||||
ADD_TEST(NAME ETS-C0P0-${filenameInput}-r0-decode
|
||||
COMMAND j2k_to_image
|
||||
-i ${INPUT_CONF}/${filenameInput}
|
||||
-o ${TEMP}/c0${filenameInput}-r0.pgx
|
||||
-r 0
|
||||
)
|
||||
|
||||
ADD_TEST(ETS-C0P0-${filenameInput}-r0-compare2ref
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME ETS-C0P0-${filenameInput}-r0-compare2ref
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_CONF}/${filenameRefSub}r0.pgx
|
||||
-t ${TEMP}/c0${filenameInput}-r0.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -77,8 +77,8 @@ IF(ignore_test_value EQUAL 0)
|
|||
PROPERTIES DEPENDS
|
||||
ETS-C0P0-${filenameInput}-r0-decode)
|
||||
|
||||
ADD_TEST(NR-C0P0-${filenameInput}-r0-compare2base
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME NR-C0P0-${filenameInput}-r0-compare2base
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_NR}/opj_${filenameRefSub}-r0.pgx
|
||||
-t ${TEMP}/c0${filenameInput}-r0.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -91,15 +91,15 @@ IF(ignore_test_value EQUAL 0)
|
|||
ETS-C0P0-${filenameInput}-r0-decode)
|
||||
|
||||
#r = 1
|
||||
ADD_TEST(ETS-C0P0-${filenameInput}-r1-decode
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_to_image
|
||||
ADD_TEST(NAME ETS-C0P0-${filenameInput}-r1-decode
|
||||
COMMAND j2k_to_image
|
||||
-i ${INPUT_CONF}/${filenameInput}
|
||||
-o ${TEMP}/c0${filenameInput}-r1.pgx
|
||||
-r 1
|
||||
)
|
||||
|
||||
ADD_TEST(ETS-C0P0-${filenameInput}-r1-compare2ref
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME ETS-C0P0-${filenameInput}-r1-compare2ref
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_CONF}/${filenameRefSub}r1.pgx
|
||||
-t ${TEMP}/c0${filenameInput}-r1.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -112,8 +112,8 @@ IF(ignore_test_value EQUAL 0)
|
|||
PROPERTIES DEPENDS
|
||||
ETS-C0P0-${filenameInput}-r1-decode)
|
||||
|
||||
ADD_TEST(NR-C0P0-${filenameInput}-r1-compare2base
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME NR-C0P0-${filenameInput}-r1-compare2base
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_NR}/opj_${filenameRefSub}-r1.pgx
|
||||
-t ${TEMP}/c0${filenameInput}-r1.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -127,15 +127,15 @@ IF(ignore_test_value EQUAL 0)
|
|||
|
||||
ELSE(numFileC0P0 EQUAL 3 OR numFileC0P0 EQUAL 15)
|
||||
|
||||
ADD_TEST(ETS-C0P0-${filenameInput}-decode
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_to_image
|
||||
ADD_TEST(NAME ETS-C0P0-${filenameInput}-decode
|
||||
COMMAND j2k_to_image
|
||||
-i ${INPUT_CONF}/${filenameInput}
|
||||
-o ${TEMP}/c0${filenameInput}.pgx
|
||||
-r ${ResFactor}
|
||||
)
|
||||
|
||||
ADD_TEST(ETS-C0P0-${filenameInput}-compare2ref
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME ETS-C0P0-${filenameInput}-compare2ref
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_CONF}/${filenameRef}
|
||||
-t ${TEMP}/c0${filenameInput}.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -148,8 +148,8 @@ IF(ignore_test_value EQUAL 0)
|
|||
PROPERTIES DEPENDS
|
||||
ETS-C0P0-${filenameInput}-decode)
|
||||
|
||||
ADD_TEST(NR-C0P0-${filenameInput}-compare2base
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME NR-C0P0-${filenameInput}-compare2base
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_NR}/opj_${filenameRef}
|
||||
-t ${TEMP}/c0${filenameInput}.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -200,15 +200,15 @@ IF(ignore_test_value2 EQUAL 0)
|
|||
get_filename_component(filenameRefSub ${filenameRef} NAME_WE)
|
||||
|
||||
#r = 0
|
||||
ADD_TEST(ETS-C0P1-${filenameInput}-r0-decode
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_to_image
|
||||
ADD_TEST(NAME ETS-C0P1-${filenameInput}-r0-decode
|
||||
COMMAND j2k_to_image
|
||||
-i ${INPUT_CONF}/${filenameInput}
|
||||
-o ${TEMP}/c0${filenameInput}-r0.pgx
|
||||
-r 0
|
||||
)
|
||||
|
||||
ADD_TEST(ETS-C0P1-${filenameInput}-r0-compare2ref
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME ETS-C0P1-${filenameInput}-r0-compare2ref
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_CONF}/${filenameRefSub}r0.pgx
|
||||
-t ${TEMP}/c0${filenameInput}-r0.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -221,8 +221,8 @@ IF(ignore_test_value2 EQUAL 0)
|
|||
PROPERTIES DEPENDS
|
||||
ETS-C0P1-${filenameInput}-r0-decode)
|
||||
|
||||
ADD_TEST(NR-C0P1-${filenameInput}-r0-compare2base
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME NR-C0P1-${filenameInput}-r0-compare2base
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_NR}/opj_${filenameRefSub}-r0.pgx
|
||||
-t ${TEMP}/c0${filenameInput}-r0.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -235,15 +235,15 @@ IF(ignore_test_value2 EQUAL 0)
|
|||
ETS-C0P1-${filenameInput}-r0-decode)
|
||||
|
||||
#r = 3
|
||||
ADD_TEST(ETS-C0P1-${filenameInput}-r3-decode
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_to_image
|
||||
ADD_TEST(NAME ETS-C0P1-${filenameInput}-r3-decode
|
||||
COMMAND j2k_to_image
|
||||
-i ${INPUT_CONF}/${filenameInput}
|
||||
-o ${TEMP}/c0${filenameInput}-r3.pgx
|
||||
-r 3
|
||||
)
|
||||
|
||||
ADD_TEST(ETS-C0P1-${filenameInput}-r3-compare2ref
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME ETS-C0P1-${filenameInput}-r3-compare2ref
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_CONF}/${filenameRefSub}r3.pgx
|
||||
-t ${TEMP}/c0${filenameInput}-r3.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -256,8 +256,8 @@ IF(ignore_test_value2 EQUAL 0)
|
|||
PROPERTIES DEPENDS
|
||||
ETS-C0P1-${filenameInput}-r3-decode)
|
||||
|
||||
ADD_TEST(NR-C0P1-${filenameInput}-r3-compare2base
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME NR-C0P1-${filenameInput}-r3-compare2base
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_NR}/opj_${filenameRefSub}-r3.pgx
|
||||
-t ${TEMP}/c0${filenameInput}-r3.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -271,15 +271,15 @@ IF(ignore_test_value2 EQUAL 0)
|
|||
|
||||
ELSE(numFileC0P1 EQUAL 4)
|
||||
|
||||
ADD_TEST(ETS-C0P1-${filenameInput}-decode
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_to_image
|
||||
ADD_TEST(NAME ETS-C0P1-${filenameInput}-decode
|
||||
COMMAND j2k_to_image
|
||||
-i ${INPUT_CONF}/${filenameInput}
|
||||
-o ${TEMP}/c0${filenameInput}.pgx
|
||||
-r ${ResFactor}
|
||||
)
|
||||
|
||||
ADD_TEST(ETS-C0P1-${filenameInput}-compare2ref
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME ETS-C0P1-${filenameInput}-compare2ref
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_CONF}/${filenameRef}
|
||||
-t ${TEMP}/c0${filenameInput}.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -292,8 +292,8 @@ IF(ignore_test_value2 EQUAL 0)
|
|||
PROPERTIES DEPENDS
|
||||
ETS-C0P1-${filenameInput}-decode)
|
||||
|
||||
ADD_TEST(NR-C0P1-${filenameInput}-compare2base
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME NR-C0P1-${filenameInput}-compare2base
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_NR}/opj_${filenameRef}
|
||||
-t ${TEMP}/c0${filenameInput}.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -339,15 +339,15 @@ FOREACH(numFileC1P0 RANGE 1 16)
|
|||
list(GET C1P0_PEAK_list ${numFileC1P0} PEAK_limit)
|
||||
list(GET C1P0_MSE_list ${numFileC1P0} MSE_limit)
|
||||
|
||||
ADD_TEST(ETS-C1P0-${filenameInput}-decode
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_to_image
|
||||
ADD_TEST(NAME ETS-C1P0-${filenameInput}-decode
|
||||
COMMAND j2k_to_image
|
||||
-i ${INPUT_CONF}/${filenameInput}
|
||||
-o ${TEMP}/c1${filenameInput}.pgx
|
||||
-r ${ResFactor}
|
||||
)
|
||||
|
||||
ADD_TEST(ETS-C1P0-${filenameInput}-compare2ref
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME ETS-C1P0-${filenameInput}-compare2ref
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_CONF}/${filenameRef}
|
||||
-t ${TEMP}/c1${filenameInput}.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -360,8 +360,8 @@ FOREACH(numFileC1P0 RANGE 1 16)
|
|||
PROPERTIES DEPENDS
|
||||
ETS-C1P0-${filenameInput}-decode)
|
||||
|
||||
ADD_TEST(NR-C1P0-${filenameInput}-compare2base
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME NR-C1P0-${filenameInput}-compare2base
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_NR}/opj_${filenameRef}
|
||||
-t ${TEMP}/c1${filenameInput}.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -398,15 +398,15 @@ FOREACH(numFileC1P1 RANGE 1 7)
|
|||
list(GET C1P1_PEAK_list ${numFileC1P1} PEAK_limit)
|
||||
list(GET C1P1_MSE_list ${numFileC1P1} MSE_limit)
|
||||
|
||||
ADD_TEST(ETS-C1P1-${filenameInput}-decode
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_to_image
|
||||
ADD_TEST(NAME ETS-C1P1-${filenameInput}-decode
|
||||
COMMAND j2k_to_image
|
||||
-i ${INPUT_CONF}/${filenameInput}
|
||||
-o ${TEMP}/c1${filenameInput}.pgx
|
||||
-r 0
|
||||
)
|
||||
|
||||
ADD_TEST(ETS-C1P1-${filenameInput}-compare2ref
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME ETS-C1P1-${filenameInput}-compare2ref
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_CONF}/${filenameRef}
|
||||
-t ${TEMP}/c1${filenameInput}.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -419,8 +419,8 @@ FOREACH(numFileC1P1 RANGE 1 7)
|
|||
PROPERTIES DEPENDS
|
||||
ETS-C1P1-${filenameInput}-decode)
|
||||
|
||||
ADD_TEST(NR-C1P1-${filenameInput}-compare2base
|
||||
${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
|
||||
ADD_TEST(NAME NR-C1P1-${filenameInput}-compare2base
|
||||
COMMAND comparePGXimages
|
||||
-b ${BASELINE_NR}/opj_${filenameRef}
|
||||
-t ${TEMP}/c1${filenameInput}.pgx
|
||||
-n ${nbComponents}
|
||||
|
@ -451,16 +451,16 @@ FOREACH(numFileJP2 RANGE 1 9)
|
|||
# Get corresponding tests parameters
|
||||
list(GET JP2_PEAK_list ${numFileJP2} PEAK_limit)
|
||||
|
||||
ADD_TEST(ETS-JP2-${filenameInput}-decode
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_to_image
|
||||
ADD_TEST(NAME ETS-JP2-${filenameInput}-decode
|
||||
COMMAND j2k_to_image
|
||||
-i ${INPUT_CONF}/${filenameInput}
|
||||
-o ${TEMP}/${filenameInput}.tif
|
||||
)
|
||||
#
|
||||
# FIXME: Need to implement a compare tif images function
|
||||
#
|
||||
# ADD_TEST(ETS-JP2-${filenameInput}-compare2ref
|
||||
# ${EXECUTABLE_OUTPUT_PATH}/compareTIFimages
|
||||
# ADD_TEST(NAME ETS-JP2-${filenameInput}-compare2ref
|
||||
# COMMAND compareTIFimages
|
||||
# -b ${BASELINE_CONF}/${filenameRef_tif}
|
||||
# -t ${TEMP}/${filenameInput}.pgx
|
||||
# -p 4
|
||||
|
@ -470,8 +470,8 @@ FOREACH(numFileJP2 RANGE 1 9)
|
|||
# PROPERTIES DEPENDS
|
||||
# ETS-JP2-${filenameInput}-decode)
|
||||
#
|
||||
# ADD_TEST(NR-JP2-${filenameInput}-compare2base
|
||||
# ${EXECUTABLE_OUTPUT_PATH}/compareTIFimages
|
||||
# ADD_TEST(NAME NR-JP2-${filenameInput}-compare2base
|
||||
# COMMAND compareTIFimages
|
||||
# -b ${BASELINE_NR}/opj_${filenameRef}
|
||||
# -t ${TEMP}/${filenameInput}.tif
|
||||
# -d
|
||||
|
@ -503,14 +503,14 @@ FOREACH(numFileP0 RANGE 1 16)
|
|||
get_filename_component(filenameRefSub ${filenameInput} NAME_WE)
|
||||
|
||||
|
||||
ADD_TEST(NR-${filenameInput}-dump
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_dump
|
||||
ADD_TEST(NAME NR-${filenameInput}-dump
|
||||
COMMAND j2k_dump
|
||||
-i ${INPUT_CONF}/${filenameInput}
|
||||
-o ${TEMP}/${filenameInput}.txt
|
||||
)
|
||||
|
||||
ADD_TEST(NR-${filenameInput}-compare_dump2base
|
||||
${EXECUTABLE_OUTPUT_PATH}/compare_dump_files
|
||||
ADD_TEST(NAME NR-${filenameInput}-compare_dump2base
|
||||
COMMAND compare_dump_files
|
||||
-b ${BASELINE_NR}/opj_${filenameRefSub}.txt
|
||||
-t ${TEMP}/${filenameInput}.txt
|
||||
)
|
||||
|
@ -532,14 +532,14 @@ FOREACH(numFileP1 RANGE 1 7)
|
|||
SET( filenameInput p1_0${numFileP1}.j2k )
|
||||
get_filename_component(filenameInputSub ${filenameInput} NAME_WE)
|
||||
|
||||
ADD_TEST(NR-${filenameInput}-dump
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_dump
|
||||
ADD_TEST(NAME NR-${filenameInput}-dump
|
||||
COMMAND j2k_dump
|
||||
-i ${INPUT_CONF}/${filenameInput}
|
||||
-o ${TEMP}/${filenameInput}.txt
|
||||
)
|
||||
|
||||
ADD_TEST(NR-${filenameInput}-compare_dump2base
|
||||
${EXECUTABLE_OUTPUT_PATH}/compare_dump_files
|
||||
ADD_TEST(NAME NR-${filenameInput}-compare_dump2base
|
||||
COMMAND compare_dump_files
|
||||
-b ${BASELINE_NR}/opj_${filenameInputSub}.txt
|
||||
-t ${TEMP}/${filenameInput}.txt
|
||||
)
|
||||
|
@ -561,14 +561,14 @@ FOREACH(numFileJP2 RANGE 1 9)
|
|||
SET( filenameInput "file${numFileJP2}.jp2" )
|
||||
get_filename_component(filenameInputSub ${filenameInput} NAME_WE)
|
||||
|
||||
ADD_TEST(NR-${filenameInput}-dump
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_dump
|
||||
ADD_TEST(NAME NR-${filenameInput}-dump
|
||||
COMMAND j2k_dump
|
||||
-i ${INPUT_CONF}/${filenameInput}
|
||||
-o ${TEMP}/${filenameInput}.txt
|
||||
)
|
||||
|
||||
ADD_TEST(NR-${filenameInput}-compare_dump2base
|
||||
${EXECUTABLE_OUTPUT_PATH}/compare_dump_files
|
||||
ADD_TEST(NAME NR-${filenameInput}-compare_dump2base
|
||||
COMMAND compare_dump_files
|
||||
-b ${BASELINE_NR}/opj_${filenameInputSub}.txt
|
||||
-t ${TEMP}/${filenameInput}.txt
|
||||
)
|
||||
|
|
|
@ -166,8 +166,8 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
|
|||
math(EXPR IT_TEST_ENC "${IT_TEST_ENC}+1" )
|
||||
|
||||
# Encode an image into the jpeg2000 format
|
||||
ADD_TEST(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode
|
||||
${EXECUTABLE_OUTPUT_PATH}/image_to_j2k
|
||||
ADD_TEST(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode
|
||||
COMMAND image_to_j2k
|
||||
${CMD_ARG_LIST_2}
|
||||
)
|
||||
|
||||
|
@ -176,8 +176,8 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
|
|||
ELSE(FAILED_TEST_FOUND)
|
||||
|
||||
# Dump the encoding file
|
||||
ADD_TEST(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-dump
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_dump
|
||||
ADD_TEST(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-dump
|
||||
COMMAND j2k_dump
|
||||
-i ${OUTPUT_FILENAME}
|
||||
-o ${OUTPUT_FILENAME}-ENC-${IT_TEST_ENC}.txt
|
||||
)
|
||||
|
@ -186,8 +186,8 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
|
|||
NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode)
|
||||
|
||||
# Compare the dump file with the baseline
|
||||
ADD_TEST(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-compare_dump2base
|
||||
${EXECUTABLE_OUTPUT_PATH}/compare_dump_files
|
||||
ADD_TEST(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-compare_dump2base
|
||||
COMMAND compare_dump_files
|
||||
-b ${BASELINE_NR}/opj_${OUTPUT_FILENAME_NAME_WE}-ENC-${IT_TEST_ENC}.txt
|
||||
-t ${OUTPUT_FILENAME}-ENC-${IT_TEST_ENC}.txt
|
||||
)
|
||||
|
@ -198,8 +198,8 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
|
|||
|
||||
# Decode the encoding file with kakadu expand command
|
||||
IF (KDU_EXPAND_EXECUTABLE)
|
||||
ADD_TEST(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref
|
||||
${KDU_EXPAND_EXECUTABLE}
|
||||
ADD_TEST(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref
|
||||
COMMAND ${KDU_EXPAND_EXECUTABLE}
|
||||
-i ${OUTPUT_FILENAME}
|
||||
-o ${OUTPUT_FILENAME}.raw
|
||||
)
|
||||
|
@ -209,8 +209,8 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
|
|||
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(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-compare_dec-ref-out2base
|
||||
${EXECUTABLE_OUTPUT_PATH}/compareRAWimages
|
||||
ADD_TEST(NAME NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-compare_dec-ref-out2base
|
||||
COMMAND compareRAWimages
|
||||
-b ${BASELINE_NR}/opj_${OUTPUT_FILENAME_NAME_WE}-ENC-${IT_TEST_ENC}.raw
|
||||
-t ${OUTPUT_FILENAME}.raw
|
||||
)
|
||||
|
@ -227,8 +227,8 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
|
|||
math(EXPR IT_TEST_DEC "${IT_TEST_DEC}+1" )
|
||||
|
||||
# Decode the input image
|
||||
ADD_TEST(NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_to_image
|
||||
ADD_TEST(NAME NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode
|
||||
COMMAND j2k_to_image
|
||||
${CMD_ARG_LIST_2}
|
||||
)
|
||||
|
||||
|
@ -245,8 +245,8 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
|
|||
|
||||
# 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
|
||||
# ADD_TEST(NAME NR-${filename}-compare2base
|
||||
# COMMAND comparePGXimages
|
||||
# -b ${BASELINE_NR}/opj_${filenameRef}
|
||||
# -t ${TEMP}/${filename}.pgx
|
||||
# -n ${nbComponents}
|
||||
|
@ -259,15 +259,15 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
|
|||
# NR-${filename}-decode)
|
||||
|
||||
# Dump the input image
|
||||
ADD_TEST(NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-dump
|
||||
${EXECUTABLE_OUTPUT_PATH}/j2k_dump
|
||||
ADD_TEST(NAME NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-dump
|
||||
COMMAND j2k_dump
|
||||
-i ${INPUT_FILENAME}
|
||||
-o ${TEMP}/${INPUT_FILENAME_NAME}.txt
|
||||
)
|
||||
|
||||
# Compare the dump output with the baseline
|
||||
ADD_TEST(NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-compare_dump2base
|
||||
${EXECUTABLE_OUTPUT_PATH}/compare_dump_files
|
||||
ADD_TEST(NAME NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-compare_dump2base
|
||||
COMMAND compare_dump_files
|
||||
-b ${BASELINE_NR}/opj_${INPUT_FILENAME_NAME_WE}.txt
|
||||
-t ${TEMP}/${INPUT_FILENAME_NAME}.txt
|
||||
)
|
||||
|
|
|
@ -5,5 +5,5 @@ add_executable(testempty2 testempty2.c)
|
|||
target_link_libraries(testempty1 openjpeg)
|
||||
target_link_libraries(testempty2 openjpeg)
|
||||
|
||||
add_test(testempty1 ${EXECUTABLE_OUTPUT_PATH}/testempty1)
|
||||
add_test(testempty2 ${EXECUTABLE_OUTPUT_PATH}/testempty2)
|
||||
add_test(NAME testempty1 COMMAND testempty1)
|
||||
add_test(NAME testempty2 COMMAND testempty2)
|
||||
|
|
Loading…
Reference in New Issue