Skip to content
This repository
Browse code

COMP: Turn off testing for Slicer build.

  • Loading branch information...
commit 61c4fb25f49dbb8b4b086e87aa75c40fb46177e5 1 parent 9172ac2
hjmjohnson hjmjohnson authored

Showing 50 changed files with 6 additions and 6 deletions. Show diff stats Hide diff stats

  1. +2 2 DWIConvert/CMakeLists.txt
  2. +4 4 DWIConvert/{ExtendedTesting → TestSuite}/CMakeLists.txt
  3. 0  DWIConvert/{ExtendedTesting → TestSuite}/DWICompare.cxx
  4. 0  DWIConvert/{ExtendedTesting → TestSuite}/DWICompare.xml
  5. 0  DWIConvert/{ExtendedTesting → TestSuite}/DWIConvertTest.cxx
  6. 0  DWIConvert/{ExtendedTesting → TestSuite}/DWISimpleCompare.cxx
  7. 0  DWIConvert/{ExtendedTesting → TestSuite}/DWISimpleCompare.xml
  8. 0  DWIConvert/{ExtendedTesting → TestSuite}/DicomToNrrdDWICompareTest.cmake
  9. 0  DWIConvert/{ExtendedTesting → TestSuite}/FSLTextFileCompare.cxx
  10. 0  DWIConvert/{ExtendedTesting → TestSuite}/FSLToNrrdTest.cmake
  11. 0  DWIConvert/{ExtendedTesting → TestSuite}/LOCAL_itkDifferenceImageFilter.h
  12. 0  DWIConvert/{ExtendedTesting → TestSuite}/LOCAL_itkDifferenceImageFilter.hxx
  13. 0  DWIConvert/{ExtendedTesting → TestSuite}/MIDAS.cmake
  14. 0  DWIConvert/{ExtendedTesting → TestSuite}/NrrdToFSLTest.cmake
  15. 0  DWIConvert/{ExtendedTesting → TestSuite}/NrrdToNIfTI.cxx
  16. 0  DWIConvert/{ExtendedTesting → TestSuite}/itkTestMain.h
  17. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/GeSignaHDx.bval.md5
  18. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/GeSignaHDx.bvec.md5
  19. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/GeSignaHDx.nii.gz.md5
  20. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/GeSignaHDx.nrrd.md5
  21. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/GeSignaHDx.tar.gz.md5
  22. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/GeSignaHDxBigEndian.tar.gz.md5
  23. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/GeSignaHDxt.nrrd.md5
  24. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/GeSignaHDxt.tar.gz.md5
  25. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/PhilipsAchieva1.nrrd.md5
  26. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/PhilipsAchieva1.tar.gz.md5
  27. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/PhilipsAchieva2.nrrd.md5
  28. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/PhilipsAchieva2.tar.gz.md5
  29. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/PhilipsAchieva3.nrrd.md5
  30. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/PhilipsAchieva3.tar.gz.md5
  31. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/PhilipsAchieva4.md5
  32. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/PhilipsAchieva4.nrrd.md5
  33. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/PhilipsAchieva6.md5
  34. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/PhilipsAchieva6.nrrd.md5
  35. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/PhilipsAchieva7.md5
  36. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/PhilipsAchieva7.nrrd.md5
  37. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/PhilipsAchievaBigEndian1.tar.gz.md5
  38. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/SiemensTrio-Syngo2004A-1.md5
  39. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/SiemensTrio-Syngo2004A-1.nrrd.md5
  40. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/SiemensTrio-Syngo2004A-2.md5
  41. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/SiemensTrio-Syngo2004A-2.nrrd.md5
  42. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/SiemensTrioTim1.md5
  43. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/SiemensTrioTim1.nrrd.md5
  44. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/SiemensTrioTim2.md5
  45. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/SiemensTrioTim2.nrrd.md5
  46. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/SiemensTrioTim3.md5
  47. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/SiemensTrioTim3.nrrd.md5
  48. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/SiemensTrioTimBigEndian1.md5
  49. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/SiemensVerio.md5
  50. 0  DWIConvert/{ExtendedTesting → TestSuite}/keys/SiemensVerio.nrrd.md5
4 DWIConvert/CMakeLists.txt
@@ -38,6 +38,6 @@ SEMMacroBuildCLI(
38 38 )
39 39
40 40 # several files needed down in ExtenededTesting
41   -if(BUILD_TESTING)
42   - add_subdirectory(ExtendedTesting)
  41 +if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
  42 + add_subdirectory(TestSuite)
43 43 endif()
8 DWIConvert/ExtendedTesting/CMakeLists.txt → DWIConvert/TestSuite/CMakeLists.txt
@@ -13,13 +13,13 @@ foreach(CLP DWICompare DWISimpleCompare)
13 13 generateclp(${CLP}_SOURCE ${CLP}.xml)
14 14 add_executable(${CLP} ${${CLP}_SOURCE})
15 15 target_link_libraries (${CLP} DWIConvertSupportLib )
16   - set(${CLP}EXE ${DWIConvert_BINARY_DIR}/ExtendedTesting/${CLP})
  16 + set(${CLP}EXE ${DWIConvert_BINARY_DIR}/TestSuite/${CLP})
17 17 endforeach()
18 18
19 19 add_executable(FSLTextFileCompare FSLTextFileCompare.cxx)
20 20 target_link_libraries (FSLTextFileCompare DWIConvertSupportLib )
21 21 set(FSLTextFileCompareEXE
22   - ${DWIConvert_BINARY_DIR}/ExtendedTesting/FSLTextFileCompare)
  22 + ${DWIConvert_BINARY_DIR}/TestSuite/FSLTextFileCompare)
23 23
24 24 add_executable(NrrdToNIfTI NrrdToNIfTI.cxx)
25 25 target_link_libraries(NrrdToNIfTI DWIConvertSupportLib)
@@ -30,7 +30,7 @@ add_dependencies(${CLP}Test ${CLP})
30 30 target_link_libraries(${CLP}Test DWIConvertSupportLib )
31 31
32 32 set (DWIConvertEXE ${Slicer_LAUNCH_COMMAND} ${DWIConvert_BINARY_DIR}/${CLP} )
33   -set (DWIConvert_TESTS ${Slicer_LAUNCH_COMMAND} ${DWIConvert_BINARY_DIR}/ExtendedTesting/${CLP}Test )
  33 +set (DWIConvert_TESTS ${Slicer_LAUNCH_COMMAND} ${DWIConvert_BINARY_DIR}/TestSuite/${CLP}Test )
34 34
35 35 if(NOT SETIFEMPTY)
36 36 macro(SETIFEMPTY)
@@ -47,7 +47,7 @@ set(TEMP ${CMAKE_CURRENT_BINARY_DIR})
47 47 include(${CMAKE_CURRENT_LIST_DIR}/MIDAS.cmake)
48 48 SETIFEMPTY(MIDAS_REST_URL "http://midas.kitware.com/api/rest" CACHE STRING "The MIDAS server where testing data resides")
49 49
50   -set(MIDAS_KEY_DIR "${DWIConvert_SOURCE_DIR}/ExtendedTesting/keys")
  50 +set(MIDAS_KEY_DIR "${DWIConvert_SOURCE_DIR}/TestSuite/keys")
51 51
52 52 add_test(DWIConvertHelpTest ${DWIConvert_TESTS}
53 53 DWIConvertTest
0  DWIConvert/ExtendedTesting/DWICompare.cxx → DWIConvert/TestSuite/DWICompare.cxx
File renamed without changes
0  DWIConvert/ExtendedTesting/DWICompare.xml → DWIConvert/TestSuite/DWICompare.xml
File renamed without changes
0  DWIConvert/ExtendedTesting/DWIConvertTest.cxx → DWIConvert/TestSuite/DWIConvertTest.cxx
File renamed without changes
0  DWIConvert/ExtendedTesting/DWISimpleCompare.cxx → DWIConvert/TestSuite/DWISimpleCompare.cxx
File renamed without changes
0  DWIConvert/ExtendedTesting/DWISimpleCompare.xml → DWIConvert/TestSuite/DWISimpleCompare.xml
File renamed without changes
0  ...t/ExtendedTesting/DicomToNrrdDWICompareTest.cmake → DWIConvert/TestSuite/DicomToNrrdDWICompareTest.cmake
File renamed without changes
0  DWIConvert/ExtendedTesting/FSLTextFileCompare.cxx → DWIConvert/TestSuite/FSLTextFileCompare.cxx
File renamed without changes
0  DWIConvert/ExtendedTesting/FSLToNrrdTest.cmake → DWIConvert/TestSuite/FSLToNrrdTest.cmake
File renamed without changes
0  .../ExtendedTesting/LOCAL_itkDifferenceImageFilter.h → ...onvert/TestSuite/LOCAL_itkDifferenceImageFilter.h
File renamed without changes
0  ...xtendedTesting/LOCAL_itkDifferenceImageFilter.hxx → ...vert/TestSuite/LOCAL_itkDifferenceImageFilter.hxx
File renamed without changes
0  DWIConvert/ExtendedTesting/MIDAS.cmake → DWIConvert/TestSuite/MIDAS.cmake
File renamed without changes
0  DWIConvert/ExtendedTesting/NrrdToFSLTest.cmake → DWIConvert/TestSuite/NrrdToFSLTest.cmake
File renamed without changes
0  DWIConvert/ExtendedTesting/NrrdToNIfTI.cxx → DWIConvert/TestSuite/NrrdToNIfTI.cxx
File renamed without changes
0  DWIConvert/ExtendedTesting/itkTestMain.h → DWIConvert/TestSuite/itkTestMain.h
File renamed without changes
0  DWIConvert/ExtendedTesting/keys/GeSignaHDx.bval.md5 → DWIConvert/TestSuite/keys/GeSignaHDx.bval.md5
File renamed without changes
0  DWIConvert/ExtendedTesting/keys/GeSignaHDx.bvec.md5 → DWIConvert/TestSuite/keys/GeSignaHDx.bvec.md5
File renamed without changes
0  ...onvert/ExtendedTesting/keys/GeSignaHDx.nii.gz.md5 → DWIConvert/TestSuite/keys/GeSignaHDx.nii.gz.md5
File renamed without changes
0  DWIConvert/ExtendedTesting/keys/GeSignaHDx.nrrd.md5 → DWIConvert/TestSuite/keys/GeSignaHDx.nrrd.md5
File renamed without changes
0  ...onvert/ExtendedTesting/keys/GeSignaHDx.tar.gz.md5 → DWIConvert/TestSuite/keys/GeSignaHDx.tar.gz.md5
File renamed without changes
0  ...tendedTesting/keys/GeSignaHDxBigEndian.tar.gz.md5 → ...ert/TestSuite/keys/GeSignaHDxBigEndian.tar.gz.md5
File renamed without changes
0  DWIConvert/ExtendedTesting/keys/GeSignaHDxt.nrrd.md5 → DWIConvert/TestSuite/keys/GeSignaHDxt.nrrd.md5
File renamed without changes
0  ...nvert/ExtendedTesting/keys/GeSignaHDxt.tar.gz.md5 → DWIConvert/TestSuite/keys/GeSignaHDxt.tar.gz.md5
File renamed without changes
0  ...ert/ExtendedTesting/keys/PhilipsAchieva1.nrrd.md5 → DWIConvert/TestSuite/keys/PhilipsAchieva1.nrrd.md5
File renamed without changes
0  ...t/ExtendedTesting/keys/PhilipsAchieva1.tar.gz.md5 → DWIConvert/TestSuite/keys/PhilipsAchieva1.tar.gz.md5
File renamed without changes
0  ...ert/ExtendedTesting/keys/PhilipsAchieva2.nrrd.md5 → DWIConvert/TestSuite/keys/PhilipsAchieva2.nrrd.md5
File renamed without changes
0  ...t/ExtendedTesting/keys/PhilipsAchieva2.tar.gz.md5 → DWIConvert/TestSuite/keys/PhilipsAchieva2.tar.gz.md5
File renamed without changes
0  ...ert/ExtendedTesting/keys/PhilipsAchieva3.nrrd.md5 → DWIConvert/TestSuite/keys/PhilipsAchieva3.nrrd.md5
File renamed without changes
0  ...t/ExtendedTesting/keys/PhilipsAchieva3.tar.gz.md5 → DWIConvert/TestSuite/keys/PhilipsAchieva3.tar.gz.md5
File renamed without changes
0  DWIConvert/ExtendedTesting/keys/PhilipsAchieva4.md5 → DWIConvert/TestSuite/keys/PhilipsAchieva4.md5
File renamed without changes
0  ...ert/ExtendedTesting/keys/PhilipsAchieva4.nrrd.md5 → DWIConvert/TestSuite/keys/PhilipsAchieva4.nrrd.md5
File renamed without changes
0  DWIConvert/ExtendedTesting/keys/PhilipsAchieva6.md5 → DWIConvert/TestSuite/keys/PhilipsAchieva6.md5
File renamed without changes
0  ...ert/ExtendedTesting/keys/PhilipsAchieva6.nrrd.md5 → DWIConvert/TestSuite/keys/PhilipsAchieva6.nrrd.md5
File renamed without changes
0  DWIConvert/ExtendedTesting/keys/PhilipsAchieva7.md5 → DWIConvert/TestSuite/keys/PhilipsAchieva7.md5
File renamed without changes
0  ...ert/ExtendedTesting/keys/PhilipsAchieva7.nrrd.md5 → DWIConvert/TestSuite/keys/PhilipsAchieva7.nrrd.md5
File renamed without changes
0  ...dTesting/keys/PhilipsAchievaBigEndian1.tar.gz.md5 → ...estSuite/keys/PhilipsAchievaBigEndian1.tar.gz.md5
File renamed without changes
0  ...ExtendedTesting/keys/SiemensTrio-Syngo2004A-1.md5 → ...nvert/TestSuite/keys/SiemensTrio-Syngo2004A-1.md5
File renamed without changes
0  ...dedTesting/keys/SiemensTrio-Syngo2004A-1.nrrd.md5 → .../TestSuite/keys/SiemensTrio-Syngo2004A-1.nrrd.md5
File renamed without changes
0  ...ExtendedTesting/keys/SiemensTrio-Syngo2004A-2.md5 → ...nvert/TestSuite/keys/SiemensTrio-Syngo2004A-2.md5
File renamed without changes
0  ...dedTesting/keys/SiemensTrio-Syngo2004A-2.nrrd.md5 → .../TestSuite/keys/SiemensTrio-Syngo2004A-2.nrrd.md5
File renamed without changes
0  DWIConvert/ExtendedTesting/keys/SiemensTrioTim1.md5 → DWIConvert/TestSuite/keys/SiemensTrioTim1.md5
File renamed without changes
0  ...ert/ExtendedTesting/keys/SiemensTrioTim1.nrrd.md5 → DWIConvert/TestSuite/keys/SiemensTrioTim1.nrrd.md5
File renamed without changes
0  DWIConvert/ExtendedTesting/keys/SiemensTrioTim2.md5 → DWIConvert/TestSuite/keys/SiemensTrioTim2.md5
File renamed without changes
0  ...ert/ExtendedTesting/keys/SiemensTrioTim2.nrrd.md5 → DWIConvert/TestSuite/keys/SiemensTrioTim2.nrrd.md5
File renamed without changes
0  DWIConvert/ExtendedTesting/keys/SiemensTrioTim3.md5 → DWIConvert/TestSuite/keys/SiemensTrioTim3.md5
File renamed without changes
0  ...ert/ExtendedTesting/keys/SiemensTrioTim3.nrrd.md5 → DWIConvert/TestSuite/keys/SiemensTrioTim3.nrrd.md5
File renamed without changes
0  ...ExtendedTesting/keys/SiemensTrioTimBigEndian1.md5 → ...nvert/TestSuite/keys/SiemensTrioTimBigEndian1.md5
File renamed without changes
0  DWIConvert/ExtendedTesting/keys/SiemensVerio.md5 → DWIConvert/TestSuite/keys/SiemensVerio.md5
File renamed without changes
0  ...onvert/ExtendedTesting/keys/SiemensVerio.nrrd.md5 → DWIConvert/TestSuite/keys/SiemensVerio.nrrd.md5
File renamed without changes

0 comments on commit 61c4fb2

Please sign in to comment.
Something went wrong with that request. Please try again.