X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=Testing%2FCMakeLists.txt;h=a24755439c6e9279429c5b206ef4016f58fe1945;hb=bbfa3cf89fc2ede7c43259e945f021044b56069f;hp=492dba614f69ea2daeba54a350616f211f4c4e89;hpb=87646d4e5c20b474db05756f796ccffab2babc4e;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 492dba61..a2475543 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -22,18 +22,18 @@ SET(TEST_SOURCES
 # add tests that require data
 IF (GDCM_DATA_ROOT)
   SET(TEST_SOURCES ${TEST_SOURCES}
-    TestSerieHeader                  # uses gdcmData as a default root directory    
     TestReadWriteReadCompare.cxx     # includes generated gdcmDataImages.h 
-    PrintAllDocument.cxx             # includes generated gdcmDataImages.h
+    TestPrintAllDocument.cxx         # includes generated gdcmDataImages.h
     TestAllReadCompareDicom.cxx      # includes generated gdcmDataImages.h
     TestAllEntryVerify.cxx           # includes generated gdcmDataImages.h
     #TestChangeHeader.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"
+    TestBuildUpDicomDir.cxx          # writes a file named "NewDICOMDIR"
+    TestMakeDicomDir.cxx             # writes a file named "NewDICOMDIR"
     TestDirList.cxx
+    TestSerieHelper                  # uses gdcmData as a default root directory    
   )
   # add test that require VTK:
   IF(GDCM_VTK)
@@ -138,24 +138,21 @@ 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"
-
-  # 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"
   
   # Multiframe Papyrus format image
-  # Just to remember this format exist, and is gdcm::Header compliant
-  # (NOT gdcm::File ...)
+  # Just to remember this format exists, and is gdcm::File compliant
+  # (NOT gdcm::FileHelper ...)
   # any contribution is welcome
-  "PET-cardio-Multiframe-Papyrus.dcm" 
+  "PET-cardio-Multiframe-Papyrus.dcm"
+  # From David Clunie's Compresion Dataset  
+  "D_CLUNIE_CT1_JLSN.dcm"
+  "D_CLUNIE_CT1_JLSL.dcm"
+  "D_CLUNIE_CT1_J2KR.dcm"
+  "D_CLUNIE_CT1_J2KI.dcm"
   )
 
-
 # Add a special test that requires dciodvfy from dicom3tools
-INCLUDE(${GDCM_SOURCE_DIR}/FindDicom3Tools.cmake)
+INCLUDE(${GDCM_SOURCE_DIR}/CMake/FindDicom3Tools.cmake)
 
 # This is a GLOB expression, change it into a list separated with a comma and \n
 SET(GDCM_DATA_IMAGES)