[trunk] Rework r2731 since it breaks non-regression testing

This commit is contained in:
Mathieu Malaterre 2014-03-14 11:42:26 +00:00
parent b7ebf54a29
commit 9194dfb94b
1 changed files with 5 additions and 2 deletions

View File

@ -515,9 +515,11 @@ foreach(kdu_file ${kdu_j2k_conf_files})
) )
if("${kdu_file}" STREQUAL "a6_mono_colr") if("${kdu_file}" STREQUAL "a6_mono_colr")
set(kdu_test_args -n 4 -s b_t_ -p 4:4:4:4 -m 1:1:1:1) set(kdu_test_args -n 4 -s b_t_ )
set(kdu_test_args_tol -p 4:4:4:4 -m 1:1:1:1)
else() else()
set(kdu_test_args -n 1 -p 4:4:4 -m 1:1:1) set(kdu_test_args -n 1 )
set(kdu_test_args_tol -p 4:4:4 -m 1:1:1)
endif() endif()
add_test(NAME ETS-KDU-${filenameInput}-compare2ref add_test(NAME ETS-KDU-${filenameInput}-compare2ref
@ -525,6 +527,7 @@ foreach(kdu_file ${kdu_j2k_conf_files})
-b ${BASELINE_CONF}/${filenameRef} -b ${BASELINE_CONF}/${filenameRef}
-t ${TEMP}/${filenameInput}.ppm -t ${TEMP}/${filenameInput}.ppm
${kdu_test_args} ${kdu_test_args}
${kdu_test_args_tol}
) )
set_tests_properties(ETS-KDU-${filenameInput}-compare2ref set_tests_properties(ETS-KDU-${filenameInput}-compare2ref