X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=913593ce8ad2c1d4abbfefa1badcbe79869812fa;hb=8c10737e97f1eff61304cfac871c54c3168f0cbc;hp=df64ba0e894143ed788963292a7eb84060e545dc;hpb=9378be0930cea755248d3e486c8d7d2bbd7d6b5e;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index df64ba0e..913593ce 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -8,30 +8,34 @@ SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests)
 # add test that does not require data:
 # They usally return if no argument is given
 SET(TEST_SOURCES
+  TestUtil.cxx
   TestBug.cxx
   TestHash.cxx
   TestTS.cxx
   TestVR.cxx
-  TestUtil.cxx
+  TestDicomDirElement.cxx
   TestDicomString.cxx
   TestDict.cxx
   TestWriteSimple.cxx
+  TestSequence.cxx
 )
 
 # add tests that require data
 IF (GDCM_DATA_ROOT)
-  SET(TEST_SOURCES ${TEST_SOURCES}     
+  SET(TEST_SOURCES ${TEST_SOURCES}
+    TestFileAccessors.cxx
     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.cxx              # uses gdcmData as a default root directory    
   )
   # add test that require VTK:
   IF(GDCM_VTK)
@@ -136,24 +140,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)