From c059f431e6262fe5ce296e8137dd478dfe4d1af1 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 24 Aug 2017 14:09:34 +0200 Subject: [PATCH] Remove broken.jpc test from known failures, by avoiding too long processing time --- tests/nonregression/md5refs.txt | 5 ++++- tests/nonregression/test_suite.ctest.in | 4 ++-- tools/travis-ci/knownfailures-all.txt | 1 - 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/nonregression/md5refs.txt b/tests/nonregression/md5refs.txt index a2cda422..bc7c6352 100644 --- a/tests/nonregression/md5refs.txt +++ b/tests/nonregression/md5refs.txt @@ -303,4 +303,7 @@ f3081c8e9e9a175f223382a7443b480f issue559-eci-091-CIELab.jp2_2.pgx 3c7ff2e4bdae849167be36589f32bcd5 issue979.j2k_0.pgx f004b48eafb2e52529cc9c7b6a3ff5d2 issue979.j2k_1.pgx 3127bd0a591d113c3c2428c8d2c14ec8 issue979.j2k_2.pgx -dacaf60e4c430916a8c2a9ebec32e71c issue979.j2k_3.pgx \ No newline at end of file +dacaf60e4c430916a8c2a9ebec32e71c issue979.j2k_3.pgx +3d710c406d4c9a53f33945db781ee544 broken.jpc_0.pgx +d1bb7f93f4c0eb984b2e9c54e544b7e9 broken.jpc_1.pgx +8cc41ccf2ef66261f1a440b8753a3f90 broken.jpc_2.pgx diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in index a224d7c4..43de4dfd 100644 --- a/tests/nonregression/test_suite.ctest.in +++ b/tests/nonregression/test_suite.ctest.in @@ -270,8 +270,8 @@ opj_decompress -i @INPUT_NR_PATH@/issue211.jp2 -o @TEMP_PATH@/i opj_decompress -i @INPUT_NR_PATH@/issue171.jp2 -o @TEMP_PATH@/issue171.jp2.pgx # issue 171 !opj_decompress -i @INPUT_NR_PATH@/issue165.jp2 -o @TEMP_PATH@/issue165.jp2.pgx -# -!opj_decompress -i @INPUT_NR_PATH@/broken.jpc -o @TEMP_PATH@/broken.jpc.pgx +# limit the decode area to avoid timeouts +opj_decompress -i @INPUT_NR_PATH@/broken.jpc -o @TEMP_PATH@/broken.jpc.pgx -d 0,0,203,254 # issue 226 opj_decompress -i @INPUT_NR_PATH@/issue226.j2k -o @TEMP_PATH@/issue226.j2k.pgx # issue 297 diff --git a/tools/travis-ci/knownfailures-all.txt b/tools/travis-ci/knownfailures-all.txt index c63b2d2d..2ca0afe5 100644 --- a/tools/travis-ci/knownfailures-all.txt +++ b/tools/travis-ci/knownfailures-all.txt @@ -1,4 +1,3 @@ NR-DEC-issue104_jpxstream.jp2-33-decode-md5 NR-DEC-issue226.j2k-74-decode-md5 NR-DEC-issue226.j2k-74-decode -NR-DEC-broken.jpc-73-decode