X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=d53cbc71e940dd1b6961f58993d87ce8e359ea1d;hb=4d7376a96afa365371c33a2fa7f814e9d81fad9f;hp=89a40dc117ff163e39c65764fb29c590a4dbdac3;hpb=1778ad2b599c79e3012b4c055d0613509039213c;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 89a40dc1..d53cbc71 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -10,6 +10,10 @@ SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests)
 SET(TEST_SOURCES
   TestBug.cxx
   TestHash.cxx
+  TestTS.cxx
+  TestVR.cxx
+  TestUtil.cxx
+  TestDicomString.cxx
 )
 
 # add tests that require data
@@ -20,18 +24,22 @@ IF (GDCM_DATA_ROOT)
     TestAllReadCompareDicom.cxx      # includes generated gdcmDataImages.h
     TestAllEntryVerify.cxx           # includes generated gdcmDataImages.h
     PrintDicomDir.cxx
-    TestChangeHeader.cxx
+    #TestChangeHeader.cxx
     TestDicomDir.cxx                 # require DICOMDIR
-   # BuildUpDicomDir.cxx
-   # makeDicomDir.cxx
+    BuildUpDicomDir.cxx              # writes a file named "NewDICOMDIR"
+    makeDicomDir.cxx                 # writes a file named "NewDICOMDIR"
+    TestCopyDicom.cxx
   )
   # add test that require VTK:
   IF(GDCM_VTK)
+    # Include the VTK library
+    INCLUDE(${VTK_USE_FILE})
+
     INCLUDE_DIRECTORIES(
       ${GDCM_SOURCE_DIR}/vtk/
       )
     SET(TEST_SOURCES ${TEST_SOURCES}
-      ShowDicom.cxx    
+      ShowDicom.cxx
       )
   ENDIF(GDCM_VTK)
 ENDIF (GDCM_DATA_ROOT)
@@ -104,36 +112,19 @@ 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"
-  #temporarily remove as it kills my gnome session (but not kde)
+  
+  # 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"
-  #png looks ugly
-  "emptyImage.dcm"
-  #png looks ugly
-  "PHILIPS_Gyroscan-8-MONO2-Odd_Sequence.dcm"
-  #png looks ugly
-  "mriThruVPRO.dcm"
-  #segfaults TestReadWriteReadCompare (same pb as below) 
-  "gdcm-MR-SIEMENS-16-1.acr"
-  # see comments in gdcmData ref file TestAllEntryVerifyReference.txt
-  "SIEMENS_GBS_III-16-ACR_NEMA_1.acr"
-  #segfaults TestReadWriteReadCompare (pixels not parsed properly):
-  "I9000001.dcm"
-  "PICKER-16-MONO2-Nested_icon.dcm"
-  "SIEMENS_Sonata-16-MONO2-Value_Multiplicity.dcm"
-  # Fails on TestAllReadCompareDicom at the RE-reading stage with message:
-  #    Big trouble : Pixel Element (7fe0,10) NOT found
-  # The temporary file GDCMDATAHOME/BaselineDicom/SIEMENS_Sonata-12-MONO2-SQ.dcm
-  # stops after the first binEntry (binary entry) as can be seen with
-  #   " gdcmbin/bin/PrintHeader 
-  #         GDCMDATAHOME/BaselineDicom/SIEMENS_Sonata-12-MONO2-SQ.dcm "
-  # and effectively the pixels are missing (as well as all the entries
-  # after tag 0029|1010)
-  # Note: this file was previously known as E00001S03I0015.dcm
-  "SIEMENS_Sonata-12-MONO2-SQ.dcm"
   )
 
-#   gdcm-ACR-LibIDO seems to be cut
-#   test.acr is very bright
+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)