X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=cfec4c304bf5d330802923b9e63b1c390ef0b6f4;hb=e0522a941acba1064185ac1f723ed43ff3c3a360;hp=aaca9643149e5d0caa5e667df74851d5cc46d003;hpb=9a8932b74aab77d55d7b478b1996611c7d588daa;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index aaca9643..cfec4c30 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -8,10 +8,10 @@ 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
-  PrintBug.cxx
-  dcm2acr.cxx
-  hashtest.cxx
-  testWrite.cxx
+  TestBug.cxx
+  TestDcm2Acr.cxx
+  TestHash.cxx
+  TestWrite.cxx
 )
 
 # add tests that require data
@@ -19,9 +19,9 @@ IF (GDCM_DATA_ROOT)
   SET(TEST_SOURCES ${TEST_SOURCES}     
     PrintHeader.cxx       #require test.acr
     PrintDicomDir.cxx
-    pourFindTaggs.cxx
-    testChangeEntete.cxx
-    testDicomDir.cxx      #require DICOMDIR
+    TestFindTags.cxx
+    TestChangeHeader.cxx
+    TestDicomDir.cxx      #require DICOMDIR
     BuildUpDicomDir.cxx
     TestReadWrite.cxx
     makeDicomDir.cxx
@@ -60,7 +60,7 @@ REMOVE (TestsToRun gdcmTests.cxx)
 FOREACH(file ${TEST_SOURCES})
   GET_FILENAME_COMPONENT(name ${file} NAME_WE)
 #  IF (GDCM_DATA_ROOT)
-#    ADD_TEST(${name} ${CXX_TEST_PATH}/gdcmTests ${name}
+#    ADD_TEST(${name} ${GDCM_TESTS} ${name}
 #        -D ${GDCM_DATA_ROOT}
 #        -T ${GDCM_BINARY_DIR}/Testing/Temporary
 #        -V Baseline/gdcm/${name}.png)
@@ -88,20 +88,31 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
     "${GDCM_DATA_ROOT}/*.dcm"
     )
   SET(GDCM_DATA_IMAGES_GLOB ${GDCM_DATA_IMAGES_GLOB_DCM} ${GDCM_DATA_IMAGES_GLOB_ACR})
+  #SET(GDCM_DATA_IMAGES_GLOB  ${GDCM_DATA_IMAGES_GLOB_ACR})
 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
   "gdcm-JPEG-LossLessThoravision.dcm"
+  "cr172241.dcm"  #temporarily remove as it kills my gnome session (but not kde)
+  "emptyImage.dcm"  #the png looks ugly...
+  "gdcm-MR-PHILIPS-16-Multi-Seq.fixed.dcm" weird looks exactly the same as gdcm-MR-PHILIPS-16-Multi-Seq.dcm
+  "gdcm-MR-PHILIPS-16.dcm" png looks ugly
+  "irmPhlipsNew1.dcm" png looks ugly
+  "mriThruVPRO.dcm"   png looks ugly
+  "US.3405.1.dcm" looks exactly the same as US.1.2.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)
 FOREACH(filename ${GDCM_DATA_IMAGES_GLOB})
   GET_FILENAME_COMPONENT(filename_temp ${filename} NAME)
   STRING(REGEX MATCH ${filename_temp} bad_dicom ${BLACK_LIST})
   IF(NOT bad_dicom)
-    SET(GDCM_DATA_IMAGES "${GDCM_DATA_IMAGES}\n\"${filename}\",")
+    SET(GDCM_DATA_IMAGES "${GDCM_DATA_IMAGES}\n\"${filename_temp}\",")
   ENDIF(NOT bad_dicom)
 ENDFOREACH(filename)