X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=96586f509a4feb6eb2e840f7384450c692422ca4;hb=7a59bd7a91b4ffcd4b24a8d18badbfc5adc3631b;hp=aaca9643149e5d0caa5e667df74851d5cc46d003;hpb=9a8932b74aab77d55d7b478b1996611c7d588daa;p=gdcm.git diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index aaca9643..96586f50 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -8,23 +8,23 @@ 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 + TestHash.cxx ) # add tests that require data IF (GDCM_DATA_ROOT) SET(TEST_SOURCES ${TEST_SOURCES} - PrintHeader.cxx #require test.acr + TestReadWriteReadCompare.cxx # includes generated gdcmDataImages.h + PrintAllDocument.cxx # includes generated gdcmDataImages.h + TestAllReadCompareDicom.cxx # includes generated gdcmDataImages.h + TestAllEntryVerify.cxx # includes generated gdcmDataImages.h PrintDicomDir.cxx - pourFindTaggs.cxx - testChangeEntete.cxx - testDicomDir.cxx #require DICOMDIR - BuildUpDicomDir.cxx - TestReadWrite.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) @@ -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) @@ -78,6 +78,8 @@ 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}/*.ima" ) ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) # Since there is a bug in cmake 1.8.3, I'll have to do two separate globs @@ -87,21 +89,86 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) FILE(GLOB GDCM_DATA_IMAGES_GLOB_DCM "${GDCM_DATA_ROOT}/*.dcm" ) - SET(GDCM_DATA_IMAGES_GLOB ${GDCM_DATA_IMAGES_GLOB_DCM} ${GDCM_DATA_IMAGES_GLOB_ACR}) + FILE(GLOB GDCM_DATA_IMAGES_GLOB_NEMA + "${GDCM_DATA_ROOT}/*.nema" + ) + FILE(GLOB GDCM_DATA_IMAGES_GLOB_IMA + "${GDCM_DATA_ROOT}/*.ima" + ) + SET(GDCM_DATA_IMAGES_GLOB + ${GDCM_DATA_IMAGES_GLOB_DCM} ${GDCM_DATA_IMAGES_GLOB_ACR} + ${GDCM_DATA_IMAGES_GLOB_NEMA} ${GDCM_DATA_IMAGES_GLOB_IMA}) + #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 + # serial killer (also segfaults vtkgdcmViewer, but NOT PrintFile) "gdcm-JPEG-LossLessThoravision.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" + + #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" + ) + # 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)