summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMickael Savinaud <savmickael@users.noreply.github.com>2011-07-27 12:45:04 +0000
committerMickael Savinaud <savmickael@users.noreply.github.com>2011-07-27 12:45:04 +0000
commitf88a57e5d79e36117dd96309dbfe55f654584653 (patch)
treeaa3a566b2657135af26d4007ef597637cd372868 /tests
parent1776120dba3610c83a27602dbcf6fcf9a9fa5d7d (diff)
added new decoding/dump tests based on data found in input/nonregresion repository (remove JPEG2000_CONFORMANCE_DATA_ROOT variable, add REF_DECODER_BIN_PATH variable for the encoder test suite). Remove definitively old tests
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt1
-rw-r--r--tests/nonregression/CMakeLists.txt55
2 files changed, 56 insertions, 0 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5021dca1..ec937023 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -42,3 +42,4 @@ IF(NOT HAVE_LIBPNG)
ENDIF(NOT HAVE_LIBPNG)
ADD_SUBDIRECTORY(conformance)
+ADD_SUBDIRECTORY(nonregression) \ No newline at end of file
diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt
new file mode 100644
index 00000000..18e57244
--- /dev/null
+++ b/tests/nonregression/CMakeLists.txt
@@ -0,0 +1,55 @@
+# NON-REGRESSION TESTS ON THIS DATASET LOCATED ${OPJ_DATA_ROOT}/input/nonregression
+
+FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Temporary)
+
+SET(TEMP ${CMAKE_CURRENT_BINARY_DIR}/Temporary)
+SET(BASELINE_NR ${OPJ_DATA_ROOT}/baseline/nonregression)
+SET(INPUT_NR ${OPJ_DATA_ROOT}/input/nonregression)
+
+FILE(GLOB_RECURSE OPJ_DATA_NR_LIST
+ "${INPUT_NR}/*.j2k"
+ "${INPUT_NR}/*.j2c"
+ "${INPUT_NR}/*.jp2"
+ )
+
+FOREACH(filepath ${OPJ_DATA_NR_LIST})
+ GET_FILENAME_COMPONENT(filename ${filepath} NAME)
+ GET_FILENAME_COMPONENT(filenameSub ${filename} NAME_WE)
+ message("${filenameSub}")
+
+ ADD_TEST(NR-${filename}-dump
+ ${EXECUTABLE_OUTPUT_PATH}/j2k_dump
+ -i ${filepath}
+ -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
+ ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image
+ -i ${filepath}
+ -o ${TEMP}/${filename}.pgx
+ )
+
+# ADD_TEST(NR-${filename}-compare2base
+# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages
+# -b ${BASELINE_NR}/opj_${filenameRef}
+# -t ${TEMP}/${filename}.pgx
+# -n ${nbComponents}
+# -d
+# -s b_t_
+# )
+#
+# SET_TESTS_PROPERTIES(NR-${filename}-compare2base
+# PROPERTIES DEPENDS
+# NR-${filename}-decode)
+
+ENDFOREACH(filepath) \ No newline at end of file