X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=fe7961c84f0c31c6e5231bef7aa04fd7aa2c74ce;hb=f2dd700472606cce1b889e6527ca7ed68a6bbde6;hp=aa226784474ee193e8e85f77cec992ebb9a58aba;hpb=7f05a0e97f099463805387812767a774e4e0699c;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index aa226784..fe7961c8 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -25,11 +25,11 @@ SET(TEST_SOURCES
   TestEnumVR.cxx
   TestBuildUpDicomDir.cxx          # writes a file named "NewDICOMDIR"
 )
-IF(UNIX)
+IF(UNIX OR WIN32)
   SET(TEST_SOURCES ${TEST_SOURCES}
-    #TestInline.cxx
+    TestInline.cxx
   )
-ENDIF(UNIX)
+ENDIF(UNIX OR WIN32)
 
 # add tests that require data
 IF (GDCM_DATA_ROOT)
@@ -59,9 +59,11 @@ IF (GDCM_DATA_ROOT)
   )
   # add test that require VTK:
   IF(GDCM_VTK)
+  
     IF("${VTK_MAJOR_VERSION}" LESS 4)
       MESSAGE(FATAL_ERROR "This VTK version is not supported, you are on your own !")
     ELSE("${VTK_MAJOR_VERSION}" LESS 4)
+    
       IF("${VTK_MAJOR_VERSION}" EQUAL 4 AND "${VTK_MINOR_VERSION}" EQUAL 2)
         MESSAGE(FATAL_ERROR "This VTK version is not supported, you are on your own !"
                              "Although gdcm should compile fine. You just need to turn BUILD_TESTING:=OFF")
@@ -70,6 +72,7 @@ IF (GDCM_DATA_ROOT)
         MESSAGE(FATAL_ERROR "This VTK version is not supported, you are on your own !"
                              "Although gdcm should compile fine. You just need to turn BUILD_TESTING:=OFF")
       ENDIF("${VTK_MAJOR_VERSION}" EQUAL 4 AND "${VTK_MINOR_VERSION}" EQUAL 4 AND "${VTK_BUILD_VERSION}" LESS 3)
+      
       # Include the VTK library since we know this is going to work
       INCLUDE(${VTK_USE_FILE})
 
@@ -127,6 +130,11 @@ FILE(GLOB GDCM_DATA_IMAGES_GLOB
   "${GDCM_DATA_ROOT}/*.ima"
   )
 
+FILE(GLOB GDCM_DATA_EXTRA_IMAGES_GLOB
+  "${GDCM_DATA_EXTRA_ROOT}/gdcmSampleData/images_of_interest/*.dcm"
+  )
+#MESSAGE(${GDCM_DATA_EXTRA_IMAGES_GLOB})
+
 # Black list of images known to break lots of readers (efilm, xmedcon ...):
 SET(BLACK_LIST
   # Multiframe Papyrus format image
@@ -171,9 +179,23 @@ SET(BLACK_LIST
   "MR_Philips_Intera_PrivateSequenceImplicitVR.dcm"
   
   # Seems this one hangs on 64 bits processors ?!?
-  # I blacklist it untill the pb is solved.
+  # I blacklist it until the pb is solved.
   # (to get some more green on the Dasboards)
   "MR_Philips-Intera_BreaksNOSHADOW.dcm"
+
+  # No way we'll ever be able to read that...
+  "ELSCINT1_LOSSLESS_RICE.dcm"
+
+  # Are we even be able to support our own bugs ?
+  "SIEMENS_MAGNETOM-12-MONO2-GDCM12-VRUN.dcm"
+  "SIEMENS_GBS_III-16-ACR_NEMA_1-ULis2Bytes.dcm"
+  "SIEMENS_ImageLocationUN.dcm"
+  "TheralysGDCM120Bug.dcm"
+  "IM-0001-0066.dcm"
+  "DMCPACS_ExplicitImplicit_BogusIOP.dcm"
+  "MR_ELSCINT1_00e1_1042_SQ_feff_00e0_Item.dcm"
+  "MR_Spectroscopy_SIEMENS_OF.dcm"
+  "ELSCINT1_PMSCT_RLE1.dcm"
   )
 
 # Create a specific list of dicom files that we know are part of a sequence
@@ -190,8 +212,8 @@ SET(GDCM_DATA_SEQ_IMAGES)
 FOREACH(filename ${GDCM_DATA_IMAGES_GLOB})
   GET_FILENAME_COMPONENT(filename_temp ${filename} NAME)
   IF(DCIODVFY_FOUND)
-    ADD_TEST("DCIODVFY-INPUT-${filename_temp}" "${DCIODVFY_EXECUTABLE}" "${filename}")
-    ADD_TEST("DCIODVFY-OUTPUT-${filename_temp}" "${DCIODVFY_EXECUTABLE}" "${GDCM_DATA_ROOT}/BaselineDicom/${filename_temp}")
+    #ADD_TEST("DCIODVFY-INPUT-${filename_temp}" "${DCIODVFY_EXECUTABLE}" "${filename}")
+    #ADD_TEST("DCIODVFY-OUTPUT-${filename_temp}" "${DCIODVFY_EXECUTABLE}" "${GDCM_DATA_ROOT}/BaselineDicom/${filename_temp}")
   ENDIF(DCIODVFY_FOUND)
   STRING(REGEX MATCH ${filename_temp} bad_dicom ${BLACK_LIST})
   IF(NOT bad_dicom)
@@ -204,6 +226,26 @@ FOREACH(filename ${GDCM_DATA_IMAGES_GLOB})
   ENDIF(NOT bad_dicom)
 ENDFOREACH(filename)
 
+# Paranoid / dcmdump
+IF(GDCM_DCMTK_CHECK)
+FOREACH(filename ${GDCM_DATA_IMAGES_GLOB} ${GDCM_DATA_EXTRA_IMAGES_GLOB})
+  GET_FILENAME_COMPONENT(filename_temp ${filename} NAME)
+  STRING(REGEX MATCH ${filename_temp} bad_dicom ${BLACK_LIST})
+  IF(NOT bad_dicom)
+    IF(BUILD_EXAMPLES)
+      FOREACH(mode a d x) #r
+        FOREACH(opt "" monochrome1 noshadowseq noshadow noseq rgb)
+          ADD_TEST(ReWrite-${mode}-${opt}-${filename_temp} ${EXECUTABLE_OUTPUT_PATH}/ReWrite filein=${filename} fileout=${GDCM_BINARY_DIR}/${mode}-${opt}-${filename_temp} mode=${mode} ${opt})
+          ADD_TEST(dcmdump-${mode}-${opt}-${filename_temp} /usr/bin/dcmdump -E -dc +ae ${GDCM_BINARY_DIR}/${mode}-${opt}-${filename_temp})
+          #ADD_TEST(ReWrite-${mode}-${opt}-${filename_temp}-bis ${EXECUTABLE_OUTPUT_PATH}/ReWrite filein=${GDCM_BINARY_DIR}/${mode}-${opt}-${filename_temp} fileout=${GDCM_BINARY_DIR}/reference.dcm mode=${mode} ${opt})
+          #ADD_TEST(diff-${mode}-${opt}-${filename_temp} /usr/bin/diff ${GDCM_BINARY_DIR}/${mode}-${opt}-${filename_temp} ${GDCM_BINARY_DIR}/reference.dcm)
+        ENDFOREACH(opt)
+      ENDFOREACH(mode)
+    ENDIF(BUILD_EXAMPLES)
+  ENDIF(NOT bad_dicom)
+ENDFOREACH(filename)
+ENDIF(GDCM_DCMTK_CHECK)
+
 # Populate GDCM_DATA_IMAGES:
 FILE(WRITE "${GDCM_BINARY_DIR}/gdcmDataImages.h"
   "const char * const gdcmDataImages[] = { ${GDCM_DATA_IMAGES}\n0 };\n"