X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=0899b62aa90b9e38028933774cc079a7a92ee392;hb=f6204e4795251ff95c653e32e8cdca61d2c19880;hp=df6016ad2357b43edf87f47d7b5c39c2548840e2;hpb=10c1c646ed20f022c10647f4b3a829a67d70f7e0;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index df6016ad..0899b62a 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -10,6 +10,8 @@ SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests)
 SET(TEST_SOURCES
   TestBug.cxx
   TestHash.cxx
+  TestTS.cxx
+  TestVR.cxx
 )
 
 # add tests that require data
@@ -20,10 +22,11 @@ IF (GDCM_DATA_ROOT)
     TestAllReadCompareDicom.cxx      # includes generated gdcmDataImages.h
     TestAllEntryVerify.cxx           # includes generated gdcmDataImages.h
     PrintDicomDir.cxx
-    TestChangeHeader.cxx
-    TestDicomDir.cxx      #require DICOMDIR
-    BuildUpDicomDir.cxx
-    makeDicomDir.cxx
+    #TestChangeHeader.cxx
+    TestDicomDir.cxx                 # require DICOMDIR
+    BuildUpDicomDir.cxx              # writes a file named "NewDICOMDIR"
+    makeDicomDir.cxx                 # writes a file named "NewDICOMDIR"
+    TestCopyDicom.cxx
   )
   # add test that require VTK:
   IF(GDCM_VTK)
@@ -77,7 +80,7 @@ IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
   FILE(GLOB GDCM_DATA_IMAGES_GLOB
     "${GDCM_DATA_ROOT}/*.acr"
     "${GDCM_DATA_ROOT}/*.dcm"
-#    "${GDCM_DATA_ROOT}/*.nema"
+    "${GDCM_DATA_ROOT}/*.nema"
     "${GDCM_DATA_ROOT}/*.ima"
     )
 ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)   
@@ -89,7 +92,7 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
     "${GDCM_DATA_ROOT}/*.dcm"
     )
   FILE(GLOB GDCM_DATA_IMAGES_GLOB_NEMA
-#    "${GDCM_DATA_ROOT}/*.nema"
+    "${GDCM_DATA_ROOT}/*.nema"
     )
   FILE(GLOB GDCM_DATA_IMAGES_GLOB_IMA
     "${GDCM_DATA_ROOT}/*.ima"
@@ -102,30 +105,15 @@ 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
+  # serial killer (also segfaults vtkgdcmViewer, but NOT PrintFile)
   "gdcm-JPEG-LossLessThoravision.dcm"
-  #temporarily remove as it kills my gnome session (but not kde)
-  "cr172241.dcm"
-  #png looks ugly
-  "emptyImage.dcm"
-  #png looks ugly
-  "irmPhlipsNew1.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"
-  # ditto
-  "icone.dcm"
-  # ditto
-  "sonataMonaco.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"
   )
 
-#   gdcm-ACR-LibIDO seems to be cut
-#   test.acr is very bright
 
 # This is a GLOB expression, change it into a list separated with a comma and \n
 SET(GDCM_DATA_IMAGES)