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

diff --git a/tests/conformance/CMakeLists.txt b/tests/conformance/CMakeLists.txt
index bd40328bcc252d4eadcfd608a297e0ed121edafc..0b2ed0a0899e2fb27de5a9d4c20c8dceb042e35e 100644 (file)
--- a/tests/conformance/CMakeLists.txt
+++ b/tests/conformance/CMakeLists.txt
@@ -515,9 +515,11 @@ foreach(kdu_file ${kdu_j2k_conf_files})
   )
 
   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()
-    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()
 
   add_test(NAME ETS-KDU-${filenameInput}-compare2ref
@@ -525,6 +527,7 @@ foreach(kdu_file ${kdu_j2k_conf_files})
     -b ${BASELINE_CONF}/${filenameRef}
     -t ${TEMP}/${filenameInput}.ppm
     ${kdu_test_args}
+    ${kdu_test_args_tol}
   )
 
   set_tests_properties(ETS-KDU-${filenameInput}-compare2ref