X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=fb86ee41ca3069247ca29a8b8bb246eba8df8319;hb=587eff0d2fdea1b61c4cc9aa21f06f2ba8b42c10;hp=e956a8316ef3da1c29c7bf3c87844a207cd7a833;hpb=2babc10f98abc61a56d9f7e04a5127216480f218;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index e956a831..fb86ee41 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -12,9 +12,11 @@ SET(TEST_SOURCES
   TestHash.cxx
   TestTS.cxx
   TestVR.cxx
+  TestDicomDirElement.cxx
   TestUtil.cxx
   TestDicomString.cxx
   TestDict.cxx
+  TestWriteSimple.cxx
 )
 
 # add tests that require data
@@ -25,9 +27,8 @@ IF (GDCM_DATA_ROOT)
     TestAllReadCompareDicom.cxx      # includes generated gdcmDataImages.h
     TestAllEntryVerify.cxx           # includes generated gdcmDataImages.h
     #TestChangeHeader.cxx
-    TestCopyDicom.cxx
-    TestCopyRescaleDicom.cxx
-    TestWriteSimple.cxx
+    TestCopyDicom.cxx                # includes generated gdcmDataImages.h 
+    TestCopyRescaleDicom.cxx         # includes generated gdcmDataImages.h 
     TestDicomDir.cxx                 # require DICOMDIR
     BuildUpDicomDir.cxx              # writes a file named "NewDICOMDIR"
     makeDicomDir.cxx                 # writes a file named "NewDICOMDIR"
@@ -42,9 +43,9 @@ IF (GDCM_DATA_ROOT)
       ${GDCM_SOURCE_DIR}/vtk/
       )
     SET(TEST_SOURCES ${TEST_SOURCES}
-      ShowDicom.cxx
-      ShowDicomSeq.cxx
-      TestWriteWithVTK.cxx
+      VTKTestRead.cxx
+      VTKTestReadSeq.cxx
+      VTKTestWrite.cxx
       )
   ENDIF(GDCM_VTK)
 ENDIF (GDCM_DATA_ROOT)
@@ -137,18 +138,31 @@ ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
 # Black list of images known to break lots of readers (efilm, xmedcon ...):
 SET(BLACK_LIST
   # serial killer (also segfaults vtkgdcmViewer, but NOT PrintFile)
-  "gdcm-JPEG-LossLessThoravision.dcm"
+  #"gdcm-JPEG-LossLessThoravision.dcm"
 
   # Mathieu: temporarily remove as it kills my gnome session (but not kde)
   # JPR: also breaks TestReadWriteReadCompare : Pixel differ (as expanded
   #      in memory)  
-  "KODAK-12-MONO1-Odd_Terminated_Sequence.dcm"
+  #"KODAK-12-MONO1-Odd_Terminated_Sequence.dcm"
+  
+  # Multiframe Papyrus format image
+  # Just to remember this format exist, and is gdcm::Header compliant
+  # (NOT gdcm::File ...)
+  # any contribution is welcome
+  "PET-cardio-Multiframe-Papyrus.dcm" 
   )
 
+
+# Add a special test that requires dciodvfy from dicom3tools
+INCLUDE(${GDCM_SOURCE_DIR}/FindDicom3Tools.cmake)
+
 # This is a GLOB expression, change it into a list separated with a comma and \n
 SET(GDCM_DATA_IMAGES)
 FOREACH(filename ${GDCM_DATA_IMAGES_GLOB})
   GET_FILENAME_COMPONENT(filename_temp ${filename} NAME)
+  IF(DCIODVFY_FOUND)
+    ADD_TEST("Clunie-${filename_temp}" "${DCIODVFY_EXECUTABLE}" "${filename}")
+  ENDIF(DCIODVFY_FOUND)
   STRING(REGEX MATCH ${filename_temp} bad_dicom ${BLACK_LIST})
   IF(NOT bad_dicom)
     SET(GDCM_DATA_IMAGES "${GDCM_DATA_IMAGES}\n\"${filename_temp}\",")