X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=eb0c544f225d16fb316a5424b3a49c1cc68c9dfb;hb=aa74099d3b9e6bf860806305891414f048b7e9a0;hp=2549dc4fc53a70ccbdd8dc7d40962e9b8a873941;hpb=56007539cb53ddd67be25af4d68e730188ac6b36;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 2549dc4f..eb0c544f 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -14,6 +14,8 @@ SET(TEST_SOURCES
   TestVR.cxx
   TestUtil.cxx
   TestDicomString.cxx
+  TestDict.cxx
+  TestDirList.cxx
 )
 
 # add tests that require data
@@ -23,14 +25,13 @@ IF (GDCM_DATA_ROOT)
     PrintAllDocument.cxx             # includes generated gdcmDataImages.h
     TestAllReadCompareDicom.cxx      # includes generated gdcmDataImages.h
     TestAllEntryVerify.cxx           # includes generated gdcmDataImages.h
-    PrintDicomDir.cxx
     #TestChangeHeader.cxx
-    TestDicomDir.cxx                 # require DICOMDIR
-    BuildUpDicomDir.cxx              # writes a file named "NewDICOMDIR"
-    makeDicomDir.cxx                 # writes a file named "NewDICOMDIR"
     TestCopyDicom.cxx
     TestCopyRescaleDicom.cxx
     TestWriteSimple.cxx
+    TestDicomDir.cxx                 # require DICOMDIR
+    BuildUpDicomDir.cxx              # writes a file named "NewDICOMDIR"
+    makeDicomDir.cxx                 # writes a file named "NewDICOMDIR"
   )
   # add test that require VTK:
   IF(GDCM_VTK)
@@ -137,9 +138,6 @@ ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
 SET(BLACK_LIST
   # serial killer (also segfaults vtkgdcmViewer, but NOT PrintFile)
   "gdcm-JPEG-LossLessThoravision.dcm"
-  
-  # Bad decompression of the jpeg part
-  "GE_RHAPSODE-16-MONO2-JPEG-Fragments.dcm"
 
   # Mathieu: temporarily remove as it kills my gnome session (but not kde)
   # JPR: also breaks TestReadWriteReadCompare : Pixel differ (as expanded
@@ -147,13 +145,6 @@ SET(BLACK_LIST
   "KODAK-12-MONO1-Odd_Terminated_Sequence.dcm"
   )
 
-IF(APPLE)
-  SET(BLACK_LIST ${BLACK_LIST}
-    "SIEMENS_GBS_III-16-ACR_NEMA_1.acr"  # This image contains a wrong length
-    # Which led us to read pass the end of the file. This seg fault on MacOSX
-    )
-ENDIF(APPLE)
-
 # 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})