[trunk] Make sure to run *-decode-md5 only after *-decode tests. Update md5 since...

diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt
index ce2dd8b61aa59a6256b822a44ee45bbdc76f5921..11eb47afe9b7113fb247df51526482c0cf7e986a 100644 (file)
--- a/tests/nonregression/CMakeLists.txt
+++ b/tests/nonregression/CMakeLists.txt
@@ -321,6 +321,9 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
           -DFILENAME:STRING=${INPUT_FILENAME_NAME}
           -P ${CMAKE_CURRENT_SOURCE_DIR}/checkmd5refs.cmake)
 
+        set_tests_properties(NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode-md5 
+          PROPERTIES DEPENDS NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode
+        )
 
 # FIXME: add a compare2base function base on raw which
 # can output png diff files if necesary

diff --git a/tests/nonregression/md5refs.txt b/tests/nonregression/md5refs.txt
index d967192e4778a02bcface508dbac86a7af5c1680..f9984b1a1e5b810b3a9c53d30ce956c08d74d10d 100644 (file)
--- a/tests/nonregression/md5refs.txt
+++ b/tests/nonregression/md5refs.txt
@@ -1,32 +1,35 @@
-6f22c9a9bd474202ac6cd3a066e15200  _00042.j2k_0.pgx
-a3a0606dfa0779d657c6a923b90e4678  _00042.j2k_1.pgx
-106954dc468dfe0884d02268e91f9f5b  _00042.j2k_2.pgx
-8889def55f1e18dae6002b9b3a6dd152  123.j2c_0.pgx
-ee6881e50c9cf17994ac74c2bee956a8  1888.pdf.asan.35.988.jp2_0.pgx
+71673036d224dedba4969aacb7a89316  _00042.j2k_0.pgx
+3f4af6ee5b706a6d43a70fb78e5b0061  _00042.j2k_1.pgx
+05e2676e5a1c8a61bdd8477fbbf5ab32  _00042.j2k_2.pgx
+e3cd8edf8a8f1975f65ed0aae4ee5069  123.j2c_0.pgx
+4bddb9f5c5f437fe1053af4d61d9202e  1336.pdf.asan.47.376.jp2_0.pgx
+f38167b983f0de0ab77e71de291bf5c0  1336.pdf.asan.47.376.jp2_1.pgx
+d9a4feed1773b7b1ae5c20bdbdd37291  1336.pdf.asan.47.376.jp2_2.pgx
 4a0daf7a9065101379eaebc28e436b1e  Bretagne2.j2k_0.pgx
 07578fc7bf81d3da694de8ae27308b82  Bretagne2.j2k_1.pgx
 3690c42f83bad42f4abea48525d45e0e  Bretagne2.j2k_2.pgx
-8889def55f1e18dae6002b9b3a6dd152  bug.j2c_0.pgx
-22c8d33a956ba83079d1102457bc77a1  buxI.j2k_0.pgx
-b8f473c07ba5ebfc195bdd53c3b3b97f  buxR.j2k_0.pgx
-05c062aca83d13b8095460f38a690a08  Cannotreaddatawithnosizeknown.j2k_0.pgx
+e3cd8edf8a8f1975f65ed0aae4ee5069  bug.j2c_0.pgx
+a4c4714bfd4f12ba6d2e81129205ce50  buxI.j2k_0.pgx
+a7be45c89d53dd4beac927a7a1d4ed29  buxR.j2k_0.pgx
+903b6d8166de3d39f70c7a924afb9887  Cannotreaddatawithnosizeknown.j2k_0.pgx
 6276da0ec5fac44d683d3468b290331d  cthead1.j2k_0.pgx
-8afcac9a696cc8d753b0eb9f4ae692ff  CT_Phillips_JPEG2K_Decompr_Problem.j2k_0.pgx
+79cee673f96a3c8ae00412927af283dc  CT_Phillips_JPEG2K_Decompr_Problem.j2k_0.pgx
 04d35ab6160c9029549f72358df984da  file409752.jp2_0.pgx
 2813bd6fdc2c306b91b3da3688b8bf49  file409752.jp2_1.pgx
 e273e2aaea4a4fc1b2cf7c09c53c3cc6  file409752.jp2_2.pgx
-05c062aca83d13b8095460f38a690a08  illegalcolortransform.j2k_0.pgx
+903b6d8166de3d39f70c7a924afb9887  illegalcolortransform.j2k_0.pgx
 cccccccccccccccccccccccccccccccc  issue104_jpxstream.jp2_0.pgx
+cb28787aa7c223f03e6acad71e244108  issue104_jpxstream.jp2_1.pgx
+cb28787aa7c223f03e6acad71e244108  issue104_jpxstream.jp2_2.pgx
 c74edbb49e132b2cfc1eaf7908197b17  issue134.jp2_0.pgx
 16fe8ed450da10a6aaae4cf6f467fc21  issue134.jp2_1.pgx
 c6091c07bf0ff221008dfb60d893cdff  issue134.jp2_2.pgx
-12a8a4668315d9ae27969991251ce853  issue135.j2k_0.pgx
-56d0b0c547d6d5bb12f0c36e88722b13  issue135.j2k_1.pgx
-48ba092fb40090c160bbd08bdf7bdbf3  issue135.j2k_2.pgx
-619694e5674992b3286244bf13058f7c  issue142.j2k_0.pgx
-c675c4b77dc3cc2a0d6542a32b438a48  issue142.j2k_1.pgx
-663ebdd12dd6a36915ea1152c43cb69a  issue142.j2k_2.pgx
-cb28787aa7c223f03e6acad71e244108  issue110.jp2_0.pgx
+cccccccccccccccccccccccccccccccc  issue135.j2k_0.pgx
+cccccccccccccccccccccccccccccccc  issue135.j2k_1.pgx
+cccccccccccccccccccccccccccccccc  issue135.j2k_2.pgx
+833cde271689e4690a7c96a621c3d067  issue142.j2k_0.pgx
+50a38e56f388c94a1459db35907331ba  issue142.j2k_1.pgx
+a2df1b66dfa7eaac5f3b9c839c5b84cc  issue142.j2k_2.pgx
 820b37ef934bd17d45dd73f5dc4d95b7  issue171.jp2_0.pgx
 4596dcd3efa51f84824b60353e2af306  issue171.jp2_1.pgx
 c2a656096b1965c3b4a26563d6ade467  issue171.jp2_2.pgx
@@ -40,30 +43,26 @@ de992d54d59032eb07d21983dbe8155b  issue205.jp2_3.pgx
 8fae7a39e459409f64e4529d2214087a  issue206_image-000.jp2_0.pgx
 555a504a93c9a14f61c894da3b393e87  issue206_image-000.jp2_1.pgx
 5f06b7c45446ae20c22cada46478a9dc  issue206_image-000.jp2_2.pgx
-b7073a2c1b5a42f9555eb0f0bd3c6510  issue208.jp2_0.pgx
-df65beeb8fd056c8f7b8dfc699caa12b  issue208.jp2_1.pgx
-15cba2ad37c1a8e1eb3eb4bc42d5a2a2  issue208.jp2_2.pgx
-301fabf4aac5729b44aab845580d5038  issue208.jp2_3.pgx
+8c0025fe9ffbff839e7735c18f56f596  issue208.jp2_0.pgx
+285fedd7e5e92624177d00eaa543e551  issue208.jp2_1.pgx
+bc5178a807be5901938d7f555275933f  issue208.jp2_2.pgx
+37546d44ecf7f2ea40a4f25d177910f3  issue208.jp2_3.pgx
 a0823d21d9de699353a3bd1adb23bd1c  issue211.jp2_0.pgx
 1820161df26c360a62d11800d6cf173f  issue211.jp2_1.pgx
-e1807db57b5f5192c4b77b83e8b5c477  issue228.j2k_0.pgx
-611948e70370bf132839fc37109859c7  issue254.jp2_0.pgx
-611948e70370bf132839fc37109859c7  issue254.jp2_1.pgx
-611948e70370bf132839fc37109859c7  issue254.jp2_2.pgx
-4093cc34d838780b35a8be410247fa7f  j2k32.j2k_0.pgx
-ce4e556aaa0844b92a92c35c200fc43e  j2k32.j2k_1.pgx
-ea926520f990640862f3fe6616097613  j2k32.j2k_2.pgx
-66b60e866991e03f9a2de18e80d3102b  kakadu_v4-4_openjpegv2_broken.j2k_0.pgx
-12a8a4668315d9ae27969991251ce85f  kodak_2layers_lrcp.j2c_0.pgx
-56d0b0c547d6d5bb12f0c36e88722b11  kodak_2layers_lrcp.j2c_1.pgx
-48ba092fb40090c160bbd08bdf7bdbf2  kodak_2layers_lrcp.j2c_2.pgx
-05c062aca83d13b8095460f38a690a08  MarkerIsNotCompliant.j2k_0.pgx
+a442b31e2b7fd49a85a5afa6f6cd9a18  issue228.j2k_0.pgx
+cccccccccccccccccccccccccccccccc  issue254.jp2_0.pgx
+cccccccccccccccccccccccccccccccc  issue254.jp2_1.pgx
+cccccccccccccccccccccccccccccccc  issue254.jp2_2.pgx
+5abdd78e99dcce6a7f4370140966eb89  j2k32.j2k_0.pgx
+ab505e4ddc590b0410798af1cb2dbb40  j2k32.j2k_1.pgx
+2eff0259c7e5a60981dc2daf25d69804  j2k32.j2k_2.pgx
+cdc63501aa572e5dfc32ccec3499f436  kakadu_v4-4_openjpegv2_broken.j2k_0.pgx
+de45172778ff18043e445615c112d0ba  kodak_2layers_lrcp.j2c_0.pgx
+1bd43cbf9639ee08b2945f2a27045618  kodak_2layers_lrcp.j2c_1.pgx
+cbaa10e5a2a795a4552632910c16e81c  kodak_2layers_lrcp.j2c_2.pgx
+903b6d8166de3d39f70c7a924afb9887  MarkerIsNotCompliant.j2k_0.pgx
 ff73d2bd32951d9e55b02186aac24aff  Marrin.jp2_0.pgx
 55ce884dd2346af6a5172a434ee578fa  Marrin.jp2_1.pgx
-29131264861b4ee21011149b27e4d488  mem-b2ace68c-1381.jp2_0.pgx
-29131264861b4ee21011149b27e4d488  mem-b2ace68c-1381.jp2_1.pgx
-29131264861b4ee21011149b27e4d488  mem-b2ace68c-1381.jp2_2.pgx
-df568fe0529219cc2c8f215e236f4b3d  mem-b2ace68c-1381.jp2_3.pgx
 41ec1a0228c703b10f95388c1160753b  mem-b2b86b74-2753.jp2_0.pgx
 41ec1a0228c703b10f95388c1160753b  mem-b2b86b74-2753.jp2_1.pgx
 41ec1a0228c703b10f95388c1160753b  mem-b2b86b74-2753.jp2_2.pgx
@@ -129,11 +128,11 @@ ce2de61ad83a71c9b13ca5df0a987a69  p1_06_3.j2k.png
 85a2b9a1324d72a8cec7041f80529242  p1_06.j2k.png
 af083204299bbdd993286892b4c9cd29  p1_06.j2k_r4.png
 af083204299bbdd993286892b4c9cd29  p1_06.j2k_t0.png
-371aa0a7ff40a73b45f1fa41e210d1db  pacs.ge.j2k_0.pgx
+b219d8a1338e9ce6ffd29dd076bbd28d  pacs.ge.j2k_0.pgx
 6ae110e1fb5a869af3dbc5fbc735b0bd  relax.jp2_0.pgx
 518a8f28dacc034982507f43763b88dd  relax.jp2_1.pgx
 c678b04f4d3e59b9d66a8bce37c553c0  relax.jp2_2.pgx
-cdb1d69eb48ffd8545751326b86d9d7e  test_lossless.j2k_0.pgx
-efc9c7f21a542a7888a9eeb73b0f7092  text_GBR.jp2_0.pgx
-54790b332b3dcbda28e1bcb31270b946  text_GBR.jp2_1.pgx
-d9bcbdc818febb8c0a6bc5f940a4ea85  text_GBR.jp2_2.pgx
+921798f6d894a0a44df5082639ea968f  test_lossless.j2k_0.pgx
+a37e7e5811d7c0c7adb61582790ccd33  text_GBR.jp2_0.pgx
+fc2173be54954a146b4e2887ee14be06  text_GBR.jp2_1.pgx
+14108b4fb8d9126750db0424417ed17d  text_GBR.jp2_2.pgx