diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2011-12-08 11:06:53 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2011-12-08 11:06:53 +0000 |
| commit | 9d1bd03be40c7777971e8ddf5da1c87989040c2a (patch) | |
| tree | 693bd7b3f2ad464b8c704f7567550a3ee03b9e6c /tests | |
| parent | 82e539d3339d4e2d837e4cd8b4c5f2766c341852 (diff) | |
Import rev 1148 from trunk.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/nonregression/CMakeLists.txt | 29 | ||||
| -rw-r--r-- | tests/nonregression/opj_ref_decode_cmd.sh.in | 4 |
2 files changed, 8 insertions, 25 deletions
diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt index 1229e74f..43ee1f77 100644 --- a/tests/nonregression/CMakeLists.txt +++ b/tests/nonregression/CMakeLists.txt @@ -9,12 +9,8 @@ SET(INPUT_NR ${OPJ_DATA_ROOT}/input/nonregression) SET(INPUT_NR_PATH ${INPUT_NR}) SET(TEMP_PATH ${TEMP}) -# FIXME: should be corectly manage with a find kakadu -IF (NOT WIN32) -CONFIGURE_FILE("opj_ref_decode_cmd.sh.in" - "${CMAKE_CURRENT_BINARY_DIR}/opj_ref_decode_cmd.sh" - @ONLY) -ENDIF (NOT WIN32) +# need kdu_expand if possible +find_package(KAKADU) STRING(COMPARE EQUAL ${REF_DECODER_BIN_PATH} "NOTFOUND" REF_DECODER_NOTFOUND) IF (REF_DECODER_NOTFOUND) @@ -206,21 +202,12 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-dump) # Decode the encoding file with kakadu expand command - IF (NOT REF_DECODER_NOTFOUND) - IF (NOT WIN32) - # Need a bash script to export the path of the kakadu library into PATH - ADD_TEST( NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref - bash ${CMAKE_CURRENT_BINARY_DIR}/opj_ref_decode_cmd.sh - -i ${OUTPUT_FILENAME} - -o ${OUTPUT_FILENAME}.raw - ) - ELSE (NOT WIN32) - ADD_TEST(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref - ${REF_DECODER_BIN_PATH}/kdu_expand - -i ${OUTPUT_FILENAME} - -o ${OUTPUT_FILENAME}.raw + IF (KDU_EXPAND_EXECUTABLE) + ADD_TEST(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref + ${KDU_EXPAND_EXECUTABLE} + -i ${OUTPUT_FILENAME} + -o ${OUTPUT_FILENAME}.raw ) - ENDIF (NOT WIN32) SET_TESTS_PROPERTIES(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref PROPERTIES DEPENDS @@ -237,7 +224,7 @@ FOREACH(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST}) PROPERTIES DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-decode-ref) - ENDIF(NOT REF_DECODER_NOTFOUND) + ENDIF() ENDIF(FAILED_TEST_FOUND) # DECODER TEST SUITE diff --git a/tests/nonregression/opj_ref_decode_cmd.sh.in b/tests/nonregression/opj_ref_decode_cmd.sh.in deleted file mode 100644 index f2147886..00000000 --- a/tests/nonregression/opj_ref_decode_cmd.sh.in +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -export LD_LIBRARY_PATH="@REF_DECODER_BIN_PATH@" -echo run following command: @REF_DECODER_BIN_PATH@/kdu_expand $@ -@REF_DECODER_BIN_PATH@/kdu_expand $@
\ No newline at end of file |