Permalink
Browse files

COMP: Turn off testing for Slicer build.

  • Loading branch information...
1 parent 9172ac2 commit 61c4fb25f49dbb8b4b086e87aa75c40fb46177e5 @hjmjohnson hjmjohnson committed Dec 1, 2012
Showing with 6 additions and 6 deletions.
  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
@@ -38,6 +38,6 @@ SEMMacroBuildCLI(
)
# several files needed down in ExtenededTesting
-if(BUILD_TESTING)
- add_subdirectory(ExtendedTesting)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
+ add_subdirectory(TestSuite)
endif()
@@ -13,13 +13,13 @@ foreach(CLP DWICompare DWISimpleCompare)
generateclp(${CLP}_SOURCE ${CLP}.xml)
add_executable(${CLP} ${${CLP}_SOURCE})
target_link_libraries (${CLP} DWIConvertSupportLib )
- set(${CLP}EXE ${DWIConvert_BINARY_DIR}/ExtendedTesting/${CLP})
+ set(${CLP}EXE ${DWIConvert_BINARY_DIR}/TestSuite/${CLP})
endforeach()
add_executable(FSLTextFileCompare FSLTextFileCompare.cxx)
target_link_libraries (FSLTextFileCompare DWIConvertSupportLib )
set(FSLTextFileCompareEXE
- ${DWIConvert_BINARY_DIR}/ExtendedTesting/FSLTextFileCompare)
+ ${DWIConvert_BINARY_DIR}/TestSuite/FSLTextFileCompare)
add_executable(NrrdToNIfTI NrrdToNIfTI.cxx)
target_link_libraries(NrrdToNIfTI DWIConvertSupportLib)
@@ -30,7 +30,7 @@ add_dependencies(${CLP}Test ${CLP})
target_link_libraries(${CLP}Test DWIConvertSupportLib )
set (DWIConvertEXE ${Slicer_LAUNCH_COMMAND} ${DWIConvert_BINARY_DIR}/${CLP} )
-set (DWIConvert_TESTS ${Slicer_LAUNCH_COMMAND} ${DWIConvert_BINARY_DIR}/ExtendedTesting/${CLP}Test )
+set (DWIConvert_TESTS ${Slicer_LAUNCH_COMMAND} ${DWIConvert_BINARY_DIR}/TestSuite/${CLP}Test )
if(NOT SETIFEMPTY)
macro(SETIFEMPTY)
@@ -47,7 +47,7 @@ set(TEMP ${CMAKE_CURRENT_BINARY_DIR})
include(${CMAKE_CURRENT_LIST_DIR}/MIDAS.cmake)
SETIFEMPTY(MIDAS_REST_URL "http://midas.kitware.com/api/rest" CACHE STRING "The MIDAS server where testing data resides")
-set(MIDAS_KEY_DIR "${DWIConvert_SOURCE_DIR}/ExtendedTesting/keys")
+set(MIDAS_KEY_DIR "${DWIConvert_SOURCE_DIR}/TestSuite/keys")
add_test(DWIConvertHelpTest ${DWIConvert_TESTS}
DWIConvertTest

0 comments on commit 61c4fb2

Please sign in to comment.