[trunk] Make sure that all output files from the test suite are using a different output name

Fixes issue 271

4 files changed, 67 insertions, 44 deletions

diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt
index 33c17895..8b85827c 100644
--- a/tests/nonregression/CMakeLists.txt
+++ b/tests/nonregression/CMakeLists.txt
@@ -320,6 +320,7 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
         add_test(NAME NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode-md5 COMMAND ${CMAKE_COMMAND}
           -DREFFILE:STRING=${CMAKE_CURRENT_SOURCE_DIR}/md5refs.txt
           -DFILENAME:STRING=${INPUT_FILENAME_NAME}
+          -DOUTFILENAME:STRING=${OUTPUT_FILENAME}
           -P ${CMAKE_CURRENT_SOURCE_DIR}/checkmd5refs.cmake)
 
         set_tests_properties(NR-DEC-${INPUT_FILENAME_NAME}-${IT_TEST_DEC}-decode-md5 
diff --git a/tests/nonregression/checkmd5refs.cmake b/tests/nonregression/checkmd5refs.cmake
index 9c1fa6ca..f94d7c09 100644
--- a/tests/nonregression/checkmd5refs.cmake
+++ b/tests/nonregression/checkmd5refs.cmake
@@ -19,10 +19,17 @@
 #message("0: ${REFFILE}")
 #message("1: ${CMAKE_CURRENT_BINARY_DIR}")
 #message("2: ${FILENAME}")
-file(GLOB globfiles "Temporary/${FILENAME}*.pgx" "Temporary/${FILENAME}*.png")
+#get_filename_component(pgxfile ${pgxfullpath} NAME)
+get_filename_component(OUTFILENAME_NAME ${OUTFILENAME} NAME)
+string(FIND ${OUTFILENAME_NAME} "." SHORTEST_EXT_POS REVERSE)
+string(SUBSTRING ${OUTFILENAME_NAME} 0 ${SHORTEST_EXT_POS} OUTFILENAME_NAME_WE)
+#message("3: ${OUTFILENAME_NAME}")
+#message("4: ${OUTFILENAME_NAME_WE}")
+#file(GLOB globfiles "Temporary/${FILENAME}*.pgx" "Temporary/${FILENAME}*.png")
+file(GLOB globfiles "Temporary/${OUTFILENAME_NAME_WE}*.pgx" "Temporary/${OUTFILENAME_NAME_WE}*.png")
 #message("6: ${globfiles}")
 if(NOT globfiles)
-  message(SEND_ERROR "Could not find output PGX files: ${FILENAME}")
+  message(SEND_ERROR "Could not find output PGX files: ${OUTFILENAME_NAME_WE}")
 endif()
 
 # REFFILE follow what md5sum -c would expect as input:
diff --git a/tests/nonregression/md5refs.txt b/tests/nonregression/md5refs.txt
index 7b7505cb..7b46562f 100644
--- a/tests/nonregression/md5refs.txt
+++ b/tests/nonregression/md5refs.txt
@@ -2,9 +2,6 @@
 a3a0606dfa0779d657c6a923b90e4678  _00042.j2k_1.pgx
 106954dc468dfe0884d02268e91f9f5b  _00042.j2k_2.pgx
 8889def55f1e18dae6002b9b3a6dd152  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
@@ -94,12 +91,18 @@ fdad26b1e078aa32bd4b77a5f44da43c  orb-blue10-lin-jp2.jp2_2.pgx
 7442756e83571c0e87493e03f12b2d34  orb-blue10-win-jp2.jp2_1.pgx
 5f99ff2aeb17e167fe7049bcf339d0b3  orb-blue10-win-jp2.jp2_2.pgx
 fe028d56d6c7aaee87239a115093412a  orb-blue10-win-jp2.jp2_3.pgx
-344233bbe643ad651f82d4e8aaa3be54  p0_04_1.j2k.png
-d105747d8fb755ef18b37ef83832f7d3  p0_04_2.j2k.png
-89000c4cb8a83fcb4166624055905258  p0_04_3.j2k.png
-af2a3ce7be9c8fb2db66ddbceff1dd53  p0_04_4.j2k.png
-757340902e8dc6d5baa4f8f4628e2bc4  p0_04_5.j2k.png
-4ec7002317a835f71630a7787cbff30a  p0_04.j2k.png
+dc78dd4b7739c92cd5291b043cc232ed  p0_04_1.j2k.png
+e157ce3ec092931d48cdaf275180ed34  p0_04_2.j2k.png
+0f0a9b3b8b41f2afaf5d80bf2f36f68c  p0_04_3.j2k.png
+f78b09250d08365b836654f717ec798c  p0_04_4.j2k.png
+d7243f4004a30d8856ef4dfa0b9f4bc8  p0_04_5.j2k.png
+344233bbe643ad651f82d4e8aaa3be54  p0_04_6_1.j2k.png
+d105747d8fb755ef18b37ef83832f7d3  p0_04_6_2.j2k.png
+89000c4cb8a83fcb4166624055905258  p0_04_6_3.j2k.png
+af2a3ce7be9c8fb2db66ddbceff1dd53  p0_04_6_4.j2k.png
+757340902e8dc6d5baa4f8f4628e2bc4  p0_04_6_5.j2k.png
+4ec7002317a835f71630a7787cbff30a  p0_04_6.j2k.png
+d7ed089096806af2f1bf687e1adb427f  p0_04.j2k.png
 4fecc6d5ebdc2db3bf3ef6bbbbb5b031  p1_04_10.j2k.png
 ab969b1d17341d062a6f4d6966a1f221  p1_04_11.j2k.png
 70fd9d6f155585258b13cb4b6c469e3f  p1_04_12.j2k.png
@@ -118,16 +121,28 @@ d41f829c40140ec9972edf86681ee53a  p1_04_2.j2k.png
 de2e66f82b9da9bc2dabda183a455b2f  p1_04_5.j2k.png
 d12b3c90d4b1cf78f0ad23eedcabe0ea  p1_04_6.j2k.png
 b3fccf3cbb7186841ba7b86e34cac0c2  p1_04.j2k.png
-da21d175c4dcb03ce1f0a227f49ed7b8  p1_06_1.j2k.png
-071597783b2141a12db1765b85943c1d  p1_06_1.j2k_t5.png
-5c434a489375fc9624bab49679cdec76  p1_06_2.j2k.png
-6778de9e9236144747fe4542d03bf6e5  p1_06_2.j2k_t9.png
-ce2de61ad83a71c9b13ca5df0a987a69  p1_06_3.j2k.png
-18f9fbfb0d29e83f697fa93523c53a2b  p1_06_4.j2k.png
-66ede889502134412872b9d8b1e40887  p1_06_5.j2k.png
-85a2b9a1324d72a8cec7041f80529242  p1_06.j2k.png
-af083204299bbdd993286892b4c9cd29  p1_06.j2k_r4.png
-af083204299bbdd993286892b4c9cd29  p1_06.j2k_t0.png
+071597783b2141a12db1765b85943c1d  p1_06_10_1.j2k.png
+6778de9e9236144747fe4542d03bf6e5  p1_06_10_2.j2k.png
+af083204299bbdd993286892b4c9cd29  p1_06_10.j2k.png
+af083204299bbdd993286892b4c9cd29  p1_06_11.j2k.png
+72a7f65be34450c9ec126fbc58399354  p1_06_1.j2k.png
+85b4f3b8f7b987f83972a820d34372a7  p1_06_2.j2k.png
+d4fc3ff73e8b5eafbcc2a111b97d362b  p1_06_3.j2k.png
+a954722553fb25692556cfa87a26bc1a  p1_06_4.j2k.png
+a62bb79d066e230ea7b34e24681de189  p1_06_5.j2k.png
+13d78a5091b06239c2b2012f7927dce8  p1_06_6.j2k.png
+da21d175c4dcb03ce1f0a227f49ed7b8  p1_06_7_1.j2k.png
+5c434a489375fc9624bab49679cdec76  p1_06_7_2.j2k.png
+ce2de61ad83a71c9b13ca5df0a987a69  p1_06_7_3.j2k.png
+18f9fbfb0d29e83f697fa93523c53a2b  p1_06_7_4.j2k.png
+66ede889502134412872b9d8b1e40887  p1_06_7_5.j2k.png
+071597783b2141a12db1765b85943c1d  p1_06_7_6.j2k.png
+85a2b9a1324d72a8cec7041f80529242  p1_06_7.j2k.png
+7045c8722e92fb2d447a6dc235a3c619  p1_06_9_1.j2k.png
+d41856648d936229f1e3e2cf7d7c7a4d  p1_06_9_2.j2k.png
+85b4f3b8f7b987f83972a820d34372a7  p1_06_9_3.j2k.png
+5fa6e85d6cfa0ed51e5933b2e35f4854  p1_06_9.j2k.png
+2e80dbe4a6af432b7f1b54dfa4e164ae  p1_06.j2k.png
 371aa0a7ff40a73b45f1fa41e210d1db  pacs.ge.j2k_0.pgx
 6ae110e1fb5a869af3dbc5fbc735b0bd  relax.jp2_0.pgx
 518a8f28dacc034982507f43763b88dd  relax.jp2_1.pgx
diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in
index 1c57aece..a0c89eda 100644
--- a/tests/nonregression/test_suite.ctest.in
+++ b/tests/nonregression/test_suite.ctest.in
@@ -173,27 +173,27 @@ opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_3.j2k.png -d
 opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_4.j2k.png -d 3,3,9,9
 opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_5.j2k.png -d 4,4,7,7
 opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_6.j2k.png -d 4,4,5,5
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06.j2k.png -d 0,0,12,12 -r 1
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_1.j2k.png -d 1,8,8,11 -r 1
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_2.j2k.png -d 9,9,12,12 -r 1
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_3.j2k.png -d 10,4,12,10 -r 1
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_4.j2k.png -d 3,3,9,9 -r 1
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_5.j2k.png -d 4,4,7,7 -r 1
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_6.j2k.png -d 4,4,5,5 -r 1
+opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_7.j2k.png -d 0,0,12,12 -r 1
+opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_7_1.j2k.png -d 1,8,8,11 -r 1
+opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_7_2.j2k.png -d 9,9,12,12 -r 1
+opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_7_3.j2k.png -d 10,4,12,10 -r 1
+opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_7_4.j2k.png -d 3,3,9,9 -r 1
+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_6.j2k.png -d 9,9,12,12 -r 2
+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.j2k_t0.png -t 0
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_1.j2k_t5.png -t 5
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_2.j2k_t9.png -t 9
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_3.j2k_t15.png -t 15
+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
+opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_9_2.j2k.png -t 9
+opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_9_3.j2k.png -t 15
 
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06.j2k_t0.png -t 0 -r 2
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_1.j2k_t5.png -t 5 -r 2
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_2.j2k_t9.png -t 9 -r 2
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_3.j2k_t15.png -t 15 -r 2
+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
 
-opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06.j2k_r4.png -r 4
+opj_decompress -i @INPUT_CONF_PATH@/p1_06.j2k -o @TEMP_PATH@/p1_06_11.j2k.png -r 4
 
 # prec=4; nb_c=3 ; signd=yes
 opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04.j2k.png -d 0,0,256,256
@@ -202,12 +202,12 @@ opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_2.j2k.png -d
 opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_3.j2k.png -d 10,150,190,210
 opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_4.j2k.png -d 100,80,200,150
 opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_5.j2k.png -d 150,20,200,50
-opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04.j2k.png -d 0,0,256,256 -r 2
-opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_1.j2k.png -d 128,0,256,128 -r 2
-opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_2.j2k.png -d 50,10,120,200 -r 2
-opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_3.j2k.png -d 10,150,190,210  -r 2
-opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_4.j2k.png -d 100,80,200,150 -r 2
-opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_5.j2k.png -d 150,20,200,50 -r 2
+opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_6.j2k.png -d 0,0,256,256 -r 2
+opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_6_1.j2k.png -d 128,0,256,128 -r 2
+opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_6_2.j2k.png -d 50,10,120,200 -r 2
+opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_6_3.j2k.png -d 10,150,190,210  -r 2
+opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_6_4.j2k.png -d 100,80,200,150 -r 2
+opj_decompress -i @INPUT_CONF_PATH@/p0_04.j2k -o @TEMP_PATH@/p0_04_6_5.j2k.png -d 150,20,200,50 -r 2
 
 # prec=8; nb_c=1 ; non standard origin (image offset and tile offset); sample sep: 2x1
 #opj_decompress -i @INPUT_CONF_PATH@/p1_01.j2k -o @TEMP_PATH@/p1_01.j2k.png -d 5,128,127,226