ENH: Remove TestDriver duplicate macro for Nonunit tests

Author: tbirdso

CMake/ITKModuleTest.cmake

@@ -64,60 +64,6 @@ EM_ASM(
   itk_module_target_label(${KIT}TestDriver)
 endmacro()
 
-
-macro(CreateTestDriver_SupportBuildInIOFactories KIT KIT_LIBS KitTests)
-  set(ADDITIONAL_SRC ${ARGN} )
-  if(EMSCRIPTEN)
-    set(emscripten_before "
-EM_ASM(
-  var cmake_source_dir = '${CMAKE_SOURCE_DIR}'.split('/');
-  // This is intentionally global so it can be unmounted at the end.
-  source_mount_dir = null;
-  if(cmake_source_dir[1] === 'home') {
-    source_mount_dir = cmake_source_dir.slice(0, 3).join('/');
-    }
-  else {
-    source_mount_dir = cmake_source_dir.slice(0, 2).join('/');
-    }
-  FS.mkdir(source_mount_dir);
-  FS.mount(NODEFS, { root: source_mount_dir }, source_mount_dir);
-
-  // This is intentionally global so it can be unmounted at the end.
-  binary_mount_dir = null;
-  var cmake_binary_dir = '${CMAKE_BINARY_DIR}'.split('/');
-  if(cmake_binary_dir[1] === 'home') {
-    binary_mount_dir = cmake_binary_dir.slice(0, 3).join('/');
-    }
-  else {
-    binary_mount_dir = cmake_binary_dir.slice(0, 2).join('/');
-    }
-  if(source_mount_dir != binary_mount_dir) {
-    FS.mkdir(binary_mount_dir);
-    FS.mount(NODEFS, { root: binary_mount_dir }, binary_mount_dir);
-    }
-  );
-")
-    set(emscripten_after "
-EM_ASM(
-  FS.unmount(source_mount_dir);
-  if(source_mount_dir != binary_mount_dir) {
-    FS.unmount(binary_mount_dir);
-    }
-  );
-")
-  endif()
-  set(CMAKE_TESTDRIVER_BEFORE_TESTMAIN "${emscripten_before}#include \"itkTestDriverBeforeTest.inc\"")
-  set(CMAKE_TESTDRIVER_AFTER_TESTMAIN "#include \"itkTestDriverAfterTest.inc\"${emscripten_after}")
-  create_test_sourcelist(Tests ${KIT}TestDriver.cxx
-    ${KitTests}
-    EXTRA_INCLUDE  itkTestDriverIncludeBuiltInIOFactories.h
-    FUNCTION  ProcessArgumentsAndRegisterBuiltInFactories
-    )
-  add_executable(${KIT}TestDriver ${KIT}TestDriver.cxx ${Tests} ${ADDITIONAL_SRC})
-  target_link_libraries(${KIT}TestDriver LINK_PUBLIC ${KIT_LIBS} ${ITKTestKernel_LIBRARIES})
-  itk_module_target_label(${KIT}TestDriver)
-endmacro()
-
 #-----------------------------------------------------------------------------
 # ITK wrapper for add_test that automatically sets the test's LABELS property
 # to the value of its containing module.

Modules/Core/TestKernel/include/itkTestDriverIncludeBuiltInIOFactories.h

@@ -11,7 +11,7 @@ itkSpatialObjectPrintTest.cxx
 itkShrinkImagePreserveObjectPhysicalLocations.cxx
 )
 
-CreateTestDriver_SupportBuildInIOFactories(ITKIntegratedTest  "${ITKIntegratedTest-Test_LIBRARIES}" "${ITKIntegratedTestTests}")
+CreateTestDriver(ITKIntegratedTest  "${ITKIntegratedTest-Test_LIBRARIES}" "${ITKIntegratedTestTests}")
 
 set(TEMP ${ITK_TEST_OUTPUT_DIR})
 

Modules/Nonunit/IntegratedTest/test/CMakeLists.txt

@@ -47,7 +47,7 @@ set(BASELINE_ROOT ${ITK_DATA_ROOT}/Baseline)
 set(TEMP ${ITK_TEST_OUTPUT_DIR})
 
 
-CreateTestDriver_SupportBuildInIOFactories(ITKReview  "${ITKReview-Test_LIBRARIES}" "${ITKReviewTests}")
+CreateTestDriver(ITKReview  "${ITKReview-Test_LIBRARIES}" "${ITKReviewTests}")
 
 itk_add_test(NAME itkReviewPrintTest COMMAND ITKReviewTestDriver itkReviewPrintTest)