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

diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in
index ffd964c2abd1859ac2db58f88f5c00d86241a38f..a224d7c45f36991f2cfc1bbf383220939e4389bd 100644 (file)
--- 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 40b84e5f6e756f288dddae78e390b31500f7d959..b1032482213ba815b2c20b4bcb7c33936e8d1a02 100644 (file)
--- 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 40b84e5f6e756f288dddae78e390b31500f7d959..b1032482213ba815b2c20b4bcb7c33936e8d1a02 100644 (file)
--- 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 bfcfa0a0bc68cc8432d7bd3162bc7863406e6910..c63b2d2d3051093637b8eb990f3aac9ebd5ad3cd 100644 (file)
--- 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