X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=11d189882c3604ebeb102b90dd789e54177a2d4b;hb=ba78e6c6d47d6db1528e8e88e5ebde7296a26692;hp=2c1bfb84417384d402a30efeb7b88db565d5cd54;hpb=d6b6699d3df0af4e4ae3d4d21d88b289ad95efbc;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 2c1bfb84..11d18988 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
@@ -25,14 +29,18 @@ IF (GDCM_DATA_ROOT)
     BuildUpDicomDir.cxx              # writes a file named "NewDICOMDIR"
     makeDicomDir.cxx                 # writes a file named "NewDICOMDIR"
     TestCopyDicom.cxx
+    #    TestRescaleDicom.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)
@@ -110,57 +118,14 @@ SET(BLACK_LIST
   # JPR: also breaks TestReadWriteReadCompare : Pixel differ (as expanded
   #      in memory)  
   "KODAK-12-MONO1-Odd_Terminated_Sequence.dcm"
-  
-  #segfaults TestReadWriteReadCompare (same pb as below) --> Fixed
-  #segfaults ShowDicom
-  "gdcm-MR-SIEMENS-16-1.acr"
-
-  #Break ShowDicom 
-  "TestReadWriteReadCompare.dcm"
-
-  # see comments in gdcmData ref file TestAllEntryVerifyReference.txt
-  # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore
-  #"SIEMENS_GBS_III-16-ACR_NEMA_1.acr"
-  
-  # Frog 2004/07/29: segfaults TestReadWriteReadCompare (pixels not
-  #                  parsed properly):
-  # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore
-  #    "GE_DLX-8-MONO2-Multiframe-Jpeg_Lossless.dcm"
-
-  # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore
-  #"PICKER-16-MONO2-Nested_icon.dcm"
-
-  # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore
-  #"SIEMENS_Sonata-16-MONO2-Value_Multiplicity.dcm"
-  
-  # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore
-  # 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"
-  
-  # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore
-  # As of 14/09 this image creates a crash:
-  # Program received signal SIGSEGV, Segmentation fault.
-  #    0x4032bc4b in gdcmHeader::GetLUTRGBA (this=0x8149228)
-  #    at /home/malaterre/Creatis/gdcm/src/gdcmHeader.cxx:1170
-  #    1170          *a = lutR[i*mult+1];
-  #"OT-PAL-8-face.dcm"
-  
-  # Files which won't break the test suite but whose png dump looks ugly.
-  # JPR: png looks ugly. so What ? ctest compliant --> un-black listed
-  #   "THERALYS-12-MONO2-Uncompressed-E_Film_Template.dcm"
-  #   "PHILIPS_Gyroscan-8-MONO2-Odd_Sequence.dcm"
-  #   "PHILIPS_Gyroscan-12-MONO2-Jpeg_Lossless.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)