diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2017-08-24 13:23:25 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2017-08-24 13:23:25 +0200 |
| commit | fdcd4e6365731cc1015213e424068131bcd1f31f (patch) | |
| tree | 59b7a4cbeec6cbbeb0d75c367c7e0a8004fbfb1b | |
| parent | bc71bd1219269057ea18e6acbc77a96ec37aba82 (diff) | |
Remove -NR-DEC-p1_06.j2k-156-decode and NR-DEC-p1_06.j2k-164-decode from knownfailures
and make them explicit failures. The result images are empty at the requested resolution
4 files changed, 5 insertions, 12 deletions
diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in index ffd964c2..a224d7c4 100644 --- a/tests/nonregression/test_suite.ctest.in +++ b/tests/nonregression/test_suite.ctest.in @@ -403,7 +403,8 @@ opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_7_4.j2k.png - opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_7_5.j2k.png -d 4,4,7,7 -r 1 opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_7_6.j2k.png -d 4,4,5,5 -r 1 -opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_8_6.j2k.png -d 9,9,12,12 -r 2 +# result is empty at this resolution +!opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_8_6.j2k.png -d 9,9,12,12 -r 2 opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_9.j2k.png -t 0 opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_9_1.j2k.png -t 5 @@ -413,7 +414,9 @@ opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_9_3.j2k.png - opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_10.j2k.png -t 0 -r 2 opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_10_1.j2k.png -t 5 -r 2 opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_10_2.j2k.png -t 9 -r 2 -opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_10_3.j2k.png -t 15 -r 2 + +# this tile is empty at this resolution +!opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_10_3.j2k.png -t 15 -r 2 opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_11.j2k.png -r 4 diff --git a/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.3-i386-Release-3rdP.txt b/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.3-i386-Release-3rdP.txt index 40b84e5f..b1032482 100644 --- a/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.3-i386-Release-3rdP.txt +++ b/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.3-i386-Release-3rdP.txt @@ -1,9 +1,6 @@ NR-DEC-issue104_jpxstream.jp2-33-decode-md5 NR-DEC-issue226.j2k-74-decode NR-DEC-issue226.j2k-74-decode-md5 -NR-DEC-p1_06.j2k-156-decode -NR-DEC-p1_06.j2k-156-decode-md5 -NR-DEC-p1_06.j2k-164-decode-md5 NR-C1P0-p0_04.j2k-compare2base NR-C1P0-p0_05.j2k-compare2base NR-C1P0-p0_06.j2k-compare2base diff --git a/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.4-i386-Release-3rdP.txt b/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.4-i386-Release-3rdP.txt index 40b84e5f..b1032482 100644 --- a/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.4-i386-Release-3rdP.txt +++ b/tools/travis-ci/knownfailures-Ubuntu12.04-gcc4.6.4-i386-Release-3rdP.txt @@ -1,9 +1,6 @@ NR-DEC-issue104_jpxstream.jp2-33-decode-md5 NR-DEC-issue226.j2k-74-decode NR-DEC-issue226.j2k-74-decode-md5 -NR-DEC-p1_06.j2k-156-decode -NR-DEC-p1_06.j2k-156-decode-md5 -NR-DEC-p1_06.j2k-164-decode-md5 NR-C1P0-p0_04.j2k-compare2base NR-C1P0-p0_05.j2k-compare2base NR-C1P0-p0_06.j2k-compare2base diff --git a/tools/travis-ci/knownfailures-all.txt b/tools/travis-ci/knownfailures-all.txt index bfcfa0a0..c63b2d2d 100644 --- a/tools/travis-ci/knownfailures-all.txt +++ b/tools/travis-ci/knownfailures-all.txt @@ -1,8 +1,4 @@ -NR-DEC-p1_06.j2k-164-decode NR-DEC-issue104_jpxstream.jp2-33-decode-md5 NR-DEC-issue226.j2k-74-decode-md5 -NR-DEC-p1_06.j2k-156-decode-md5 -NR-DEC-p1_06.j2k-164-decode-md5 -NR-DEC-p1_06.j2k-156-decode NR-DEC-issue226.j2k-74-decode NR-DEC-broken.jpc-73-decode |