From b7ebf54a29a9275939bf86b7548f547a8bac3614 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Fri, 14 Mar 2014 11:37:44 +0000 Subject: [PATCH] [trunk] Be more verbose about failure. Update issue 294 --- tests/compare_images.c | 2 +- tests/conformance/CMakeLists.txt | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/compare_images.c b/tests/compare_images.c index f0dc5e82..38c36f51 100644 --- a/tests/compare_images.c +++ b/tests/compare_images.c @@ -196,7 +196,7 @@ static opj_image_t* readImageFromFilePPM(const char* filename, int nbFilenamePGX if (!image_read) { int it_free_data; - fprintf(stderr, "Unable to load pgx file\n"); + fprintf(stderr, "Unable to load ppm file: %s\n", filenameComponentPGX); free(param_image_read); diff --git a/tests/conformance/CMakeLists.txt b/tests/conformance/CMakeLists.txt index 85c2cf86..bd40328b 100644 --- a/tests/conformance/CMakeLists.txt +++ b/tests/conformance/CMakeLists.txt @@ -515,9 +515,9 @@ foreach(kdu_file ${kdu_j2k_conf_files}) ) if("${kdu_file}" STREQUAL "a6_mono_colr") - set(kdu_test_args -n 4 -s b_t_) + set(kdu_test_args -n 4 -s b_t_ -p 4:4:4:4 -m 1:1:1:1) else() - set(kdu_test_args -n 1) + set(kdu_test_args -n 1 -p 4:4:4 -m 1:1:1) endif() add_test(NAME ETS-KDU-${filenameInput}-compare2ref @@ -525,8 +525,6 @@ foreach(kdu_file ${kdu_j2k_conf_files}) -b ${BASELINE_CONF}/${filenameRef} -t ${TEMP}/${filenameInput}.ppm ${kdu_test_args} - -p 4:4:4 - -m 1:1:1 ) set_tests_properties(ETS-KDU-${filenameInput}-compare2ref