Cleanup: refactor tests executing Blender to use add_blender_test function

1 files changed, 116 insertions, 158 deletions

diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 737f4666aae..1e006ca611c 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -45,96 +45,105 @@ endif()
 # set(TEST_BLENDER_EXE_BARE ${TEST_BLENDER_EXE})
 # set(TEST_BLENDER_EXE ${TEST_BLENDER_EXE} ${TEST_BLENDER_EXE_PARAMS} )
 
+# Run Blender command with parameters.
+function(add_blender_test name)
+  add_test(
+    NAME ${name}
+    COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS} ${ARGN}
+  )
+endfunction()
+
+# Run Python script outside Blender.
+function(add_python_test testname testscript)
+  if(MSVC)
+    add_blender_test(
+      ${testname}
+        "$<TARGET_FILE_DIR:blender>/${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}/python/bin/python$<$<CONFIG:Debug>:_d>"
+        ${testscript} ${ARGN}
+    )
+  else()
+    add_blender_test(
+      ${testname}
+    )
+  endif()
+endfunction()
 
 # ------------------------------------------------------------------------------
 # GENERAL PYTHON CORRECTNESS TESTS
-add_test(
-  NAME script_load_keymap
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  script_load_keymap
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_keymap_completeness.py
 )
 
-add_test(
-  NAME script_load_addons
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  script_load_addons
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_load_addons.py
 )
 
-add_test(
-  NAME script_load_modules
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  script_load_modules
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_load_py_modules.py
 )
 
 # test running operators doesn't segfault under various conditions
 if(USE_EXPERIMENTAL_TESTS)
-  add_test(
-    NAME script_run_operators
-    COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+  add_blender_test(
+    script_run_operators
     --python ${CMAKE_CURRENT_LIST_DIR}/bl_run_operators.py
   )
 endif()
 
 # ------------------------------------------------------------------------------
 # PY API TESTS
-add_test(
-  NAME script_pyapi_bpy_path
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  script_pyapi_bpy_path
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_pyapi_bpy_path.py
 )
 
-add_test(
-  NAME script_pyapi_bpy_utils_units
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  script_pyapi_bpy_utils_units
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_pyapi_bpy_utils_units.py
 )
 
-add_test(
-  NAME script_pyapi_mathutils
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  script_pyapi_mathutils
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_pyapi_mathutils.py
 )
 
-add_test(
-  NAME script_pyapi_idprop
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  script_pyapi_idprop
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_pyapi_idprop.py
 )
 
-add_test(
-  NAME script_pyapi_idprop_datablock
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  script_pyapi_idprop_datablock
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_pyapi_idprop_datablock.py
 )
 
 # ------------------------------------------------------------------------------
 # MODELING TESTS
-add_test(
-  NAME bmesh_bevel
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  bmesh_bevel
   ${TEST_SRC_DIR}/modeling/bevel_regression.blend
   --python-text run_tests
 )
 
-add_test(
-  NAME bmesh_boolean
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  bmesh_boolean
   ${TEST_SRC_DIR}/modeling/bool_regression.blend
   --python-text run_tests
 )
 
-add_test(
-  NAME bmesh_split_faces
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  bmesh_split_faces
   ${TEST_SRC_DIR}/modeling/split_faces_test.blend
   --python-text run_tests
 )
 
 # ------------------------------------------------------------------------------
 # MODIFIERS TESTS
-add_test(
-  NAME object_modifier_array
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  object_modifier_array
   ${TEST_SRC_DIR}/modifier_stack/array_test.blend
   --python-text run_tests.py
 )
@@ -145,27 +154,24 @@ add_test(
 # OBJ Import tests
 # disabled until updated & working
 if(FALSE)
-add_test(
-  NAME import_obj_cube
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_obj_cube
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_scene.obj\(filepath='${TEST_SRC_DIR}/io_tests/obj/cube.obj'\)
   --md5=39cce4bacac2d1b18fc470380279bc15 --md5_method=SCENE
   --write-blend=${TEST_OUT_DIR}/io_tests/import_obj_cube.blend
 )
 
-add_test(
-  NAME import_obj_nurbs_cyclic
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_obj_nurbs_cyclic
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_scene.obj\(filepath='${TEST_SRC_DIR}/io_tests/obj/nurbs_cyclic.obj'\)
   --md5=ad3c307e5883224a0492378cd32691ab --md5_method=SCENE
   --write-blend=${TEST_OUT_DIR}/io_tests/import_obj_nurbs_cyclic.blend
 )
 
-add_test(
-  NAME import_obj_makehuman
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_obj_makehuman
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_scene.obj\(filepath='${TEST_SRC_DIR}/io_tests/obj/makehuman.obj'\)
   --md5=c9f78b185e58358daa4ecaecfa75464e --md5_method=SCENE
@@ -174,9 +180,8 @@ add_test(
 endif()
 
 # OBJ Export tests
-add_test(
-  NAME export_obj_cube
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_obj_cube
   ${TEST_SRC_DIR}/io_tests/blend_geometry/all_quads.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_scene.obj\(filepath='${TEST_OUT_DIR}/io_tests/export_obj_cube.obj',use_selection=False\)
@@ -185,9 +190,8 @@ add_test(
   --md5=95832f81160f07101dc566cb286a9f76 --md5_method=FILE
 )
 
-add_test(
-  NAME export_obj_nurbs
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_obj_nurbs
   ${TEST_SRC_DIR}/io_tests/blend_geometry/nurbs.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_scene.obj\(filepath='${TEST_OUT_DIR}/io_tests/export_obj_nurbs.obj',use_selection=False,use_nurbs=True\)
@@ -198,9 +202,8 @@ add_test(
 
 # disabled until updated & working
 if(FALSE)
-add_test(
-  NAME export_obj_all_objects
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_obj_all_objects
   ${TEST_SRC_DIR}/io_tests/blend_scene/all_objects.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_scene.obj\(filepath='${TEST_OUT_DIR}/io_tests/export_obj_all_objects.obj',use_selection=False,use_nurbs=True\)
@@ -213,27 +216,24 @@ endif()
 
 
 # PLY Import tests
-add_test(
-  NAME import_ply_cube
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_ply_cube
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_mesh.ply\(filepath='${TEST_SRC_DIR}/io_tests/ply/cube_ascii.ply'\)
   --md5=527134343c27fc0ea73115b85fbfd3ac --md5_method=SCENE
   --write-blend=${TEST_OUT_DIR}/io_tests/import_ply_cube.blend
 )
 
-add_test(
-  NAME import_ply_bunny
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_ply_bunny
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_mesh.ply\(filepath='${TEST_SRC_DIR}/io_tests/ply/bunny2.ply'\)
   --md5=6ea5b8533400a17accf928b8fd024eaa --md5_method=SCENE
   --write-blend=${TEST_OUT_DIR}/io_tests/import_ply_bunny.blend
 )
 
-add_test(
-  NAME import_ply_small_holes
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_ply_small_holes
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_mesh.ply\(filepath='${TEST_SRC_DIR}/io_tests/ply/many_small_holes.ply'\)
   --md5=c3093e26ecae5b6d59fbbcf2a0d0b39f --md5_method=SCENE
@@ -243,9 +243,8 @@ add_test(
 # PLY Export
 # disabled until updated & working
 if(FALSE)
-add_test(
-  NAME export_ply_cube_all_data
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_ply_cube_all_data
   ${TEST_SRC_DIR}/io_tests/blend_geometry/cube_all_data.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_mesh.ply\(filepath='${TEST_OUT_DIR}/io_tests/export_ply_cube_all_data.ply'\)
@@ -253,9 +252,8 @@ add_test(
   --md5=6adc3748ceae8298496f99d0e7e76c15 --md5_method=FILE
 )
 
-add_test(
-  NAME export_ply_suzanne_all_data
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_ply_suzanne_all_data
   ${TEST_SRC_DIR}/io_tests/blend_geometry/suzanne_all_data.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_mesh.ply\(filepath='${TEST_OUT_DIR}/io_tests/export_ply_suzanne_all_data.ply'\)
@@ -264,9 +262,8 @@ add_test(
 )
 endif()
 
-add_test(
-  NAME export_ply_vertices # lame, add a better one
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_ply_vertices # lame, add a better one
   ${TEST_SRC_DIR}/io_tests/blend_geometry/vertices.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_mesh.ply\(filepath='${TEST_OUT_DIR}/io_tests/export_ply_vertices.ply'\)
@@ -278,27 +275,24 @@ add_test(
 # STL Import tests
 # disabled until updated & working
 if(FALSE)
-add_test(
-  NAME import_stl_cube
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_stl_cube
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_mesh.stl\(filepath='${TEST_SRC_DIR}/io_tests/stl/cube.stl'\)
   --md5=8ceb5bb7e1cb5f4342fa1669988c66b4 --md5_method=SCENE
   --write-blend=${TEST_OUT_DIR}/io_tests/import_stl_cube.blend
 )
 
-add_test(
-  NAME import_stl_conrod
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_stl_conrod
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_mesh.stl\(filepath='${TEST_SRC_DIR}/io_tests/stl/conrod.stl'\)
   --md5=690a4b8eb9002dcd8631c5a575ea7348 --md5_method=SCENE
   --write-blend=${TEST_OUT_DIR}/io_tests/import_stl_conrod.blend
 )
 
-add_test(
-  NAME import_stl_knot_max_simplified
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_stl_knot_max_simplified
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_mesh.stl\(filepath='${TEST_SRC_DIR}/io_tests/stl/knot_max_simplified.stl'\)
   --md5=baf82803f45a84ec4ddbad9cef57dd3e --md5_method=SCENE
@@ -309,9 +303,8 @@ endif()
 # STL Export
 # disabled until updated & working
 if(FALSE)
-add_test(
-  NAME export_stl_cube_all_data
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_stl_cube_all_data
   ${TEST_SRC_DIR}/io_tests/blend_geometry/cube_all_data.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_mesh.stl\(filepath='${TEST_OUT_DIR}/io_tests/export_stl_cube_all_data.stl'\)
@@ -319,9 +312,8 @@ add_test(
   --md5=64cb97c0cabb015e1c3f76369835075a --md5_method=FILE
 )
 
-add_test(
-  NAME export_stl_suzanne_all_data
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_stl_suzanne_all_data
   ${TEST_SRC_DIR}/io_tests/blend_geometry/suzanne_all_data.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_mesh.stl\(filepath='${TEST_OUT_DIR}/io_tests/export_stl_suzanne_all_data.stl'\)
@@ -329,9 +321,8 @@ add_test(
   --md5=e9b23c97c139ad64961c635105bb9192 --md5_method=FILE
 )
 
-add_test(
-  NAME export_stl_vertices # lame, add a better one
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_stl_vertices # lame, add a better one
   ${TEST_SRC_DIR}/io_tests/blend_geometry/vertices.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_mesh.stl\(filepath='${TEST_OUT_DIR}/io_tests/export_stl_vertices.stl'\)
@@ -344,27 +335,24 @@ endif()
 # X3D Import
 # disabled until updated & working
 if(FALSE)
-add_test(
-  NAME import_x3d_cube
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_x3d_cube
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_scene.x3d\(filepath='${TEST_SRC_DIR}/io_tests/x3d/color_cube.x3d'\)
   --md5=3fae9be004199c145941cd3f9f80ad7b --md5_method=SCENE
   --write-blend=${TEST_OUT_DIR}/io_tests/import_x3d_cube.blend
 )
 
-add_test(
-  NAME import_x3d_teapot
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_x3d_teapot
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_scene.x3d\(filepath='${TEST_SRC_DIR}/io_tests/x3d/teapot.x3d'\)
   --md5=8ee196c71947dce4199d55698501691e --md5_method=SCENE
   --write-blend=${TEST_OUT_DIR}/io_tests/import_x3d_teapot.blend
 )
 
-add_test(
-  NAME import_x3d_suzanne_material
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_x3d_suzanne_material
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_scene.x3d\(filepath='${TEST_SRC_DIR}/io_tests/x3d/suzanne_material.x3d'\)
   --md5=3edea1353257d8b5a5f071942f417be6 --md5_method=SCENE
@@ -372,9 +360,8 @@ add_test(
 )
 
 # X3D Export
-add_test(
-  NAME export_x3d_cube
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_x3d_cube
   ${TEST_SRC_DIR}/io_tests/blend_geometry/all_quads.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_scene.x3d\(filepath='${TEST_OUT_DIR}/io_tests/export_x3d_cube.x3d',use_selection=False\)
@@ -382,9 +369,8 @@ add_test(
   --md5=05312d278fe41da33560fdfb9bdb268f --md5_method=FILE
 )
 
-add_test(
-  NAME export_x3d_nurbs
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_x3d_nurbs
   ${TEST_SRC_DIR}/io_tests/blend_geometry/nurbs.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_scene.x3d\(filepath='${TEST_OUT_DIR}/io_tests/export_x3d_nurbs.x3d',use_selection=False\)
@@ -392,9 +378,8 @@ add_test(
   --md5=4286d4a2aa507ef78b22ddcbdcc88481 --md5_method=FILE
 )
 
-add_test(
-  NAME export_x3d_all_objects
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_x3d_all_objects
   ${TEST_SRC_DIR}/io_tests/blend_scene/all_objects.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_scene.x3d\(filepath='${TEST_OUT_DIR}/io_tests/export_x3d_all_objects.x3d',use_selection=False\)
@@ -408,27 +393,24 @@ endif()
 # 3DS Import
 # disabled until updated & working
 if(FALSE)
-add_test(
-  NAME import_3ds_cube
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_3ds_cube
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_scene.autodesk_3ds\(filepath='${TEST_SRC_DIR}/io_tests/3ds/cube.3ds'\)
   --md5=cb5a45c35a343c3f5beca2a918472951 --md5_method=SCENE
   --write-blend=${TEST_OUT_DIR}/io_tests/import_3ds_cube.blend
 )
 
-add_test(
-  NAME import_3ds_hierarchy_lara
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_3ds_hierarchy_lara
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_scene.autodesk_3ds\(filepath='${TEST_SRC_DIR}/io_tests/3ds/hierarchy_lara.3ds'\)
   --md5=766c873d9fdb5f190e43796cfbae63b6 --md5_method=SCENE
   --write-blend=${TEST_OUT_DIR}/io_tests/import_3ds_hierarchy_lara.blend
 )
 
-add_test(
-  NAME import_3ds_hierarchy_greek_trireme
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  import_3ds_hierarchy_greek_trireme
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.import_scene.autodesk_3ds\(filepath='${TEST_SRC_DIR}/io_tests/3ds/hierarchy_greek_trireme.3ds'\)
   --md5=b62ee30101e8999cb91ef4f8a8760056 --md5_method=SCENE
@@ -439,9 +421,8 @@ endif()
 # 3DS Export
 # disabled until updated & working
 if(FALSE)
-add_test(
-  NAME export_3ds_cube
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_3ds_cube
   ${TEST_SRC_DIR}/io_tests/blend_geometry/all_quads.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_scene.autodesk_3ds\(filepath='${TEST_OUT_DIR}/io_tests/export_3ds_cube.3ds',use_selection=False\)
@@ -449,9 +430,8 @@ add_test(
   --md5=a31f5071b6c6dc7445b9099cdc7f63b3 --md5_method=FILE
 )
 
-add_test(
-  NAME export_3ds_nurbs
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_3ds_nurbs
   ${TEST_SRC_DIR}/io_tests/blend_geometry/nurbs.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_scene.autodesk_3ds\(filepath='${TEST_OUT_DIR}/io_tests/export_3ds_nurbs.3ds',use_selection=False\)
@@ -459,9 +439,8 @@ add_test(
   --md5=5bdd21be3c80d814fbc83cb25edb08c2 --md5_method=FILE
 )
 
-add_test(
-  NAME export_3ds_all_objects
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_3ds_all_objects
   ${TEST_SRC_DIR}/io_tests/blend_scene/all_objects.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_scene.autodesk_3ds\(filepath='${TEST_OUT_DIR}/io_tests/export_3ds_all_objects.3ds',use_selection=False\)
@@ -476,9 +455,8 @@ endif()
 # 'use_metadata=False' for reliable md5's
 # disabled until updated & working
 if(FALSE)
-add_test(
-  NAME export_fbx_cube
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_fbx_cube
   ${TEST_SRC_DIR}/io_tests/blend_geometry/all_quads.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_scene.fbx\(filepath='${TEST_OUT_DIR}/io_tests/export_fbx_cube.fbx',use_selection=False,use_metadata=False\)
@@ -486,9 +464,8 @@ add_test(
   --md5=59a35577462f95f9a0b4e6035226ce9b --md5_method=FILE
 )
 
-add_test(
-  NAME export_fbx_nurbs
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_fbx_nurbs
   ${TEST_SRC_DIR}/io_tests/blend_geometry/nurbs.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_scene.fbx\(filepath='${TEST_OUT_DIR}/io_tests/export_fbx_nurbs.fbx',use_selection=False,use_metadata=False\)
@@ -496,9 +473,8 @@ add_test(
   --md5=d31875f18f613fa0c3b16e978f87f6f8 --md5_method=FILE
 )
 
-add_test(
-  NAME export_fbx_all_objects
-  COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+add_blender_test(
+  export_fbx_all_objects
   ${TEST_SRC_DIR}/io_tests/blend_scene/all_objects.blend
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
   --run={'FINISHED'}&bpy.ops.export_scene.fbx\(filepath='${TEST_OUT_DIR}/io_tests/export_fbx_all_objects.fbx',use_selection=False,use_metadata=False\)
@@ -507,23 +483,6 @@ add_test(
 )
 endif()
 
-# Run Python script outside Blender.
-function(add_python_test testname testscript)
-  if(MSVC)
-    add_test(
-      NAME ${testname}
-      COMMAND
-        "$<TARGET_FILE_DIR:blender>/${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}/python/bin/python$<$<CONFIG:Debug>:_d>"
-        ${testscript} ${ARGN}
-    )
-  else()
-    add_test(
-      NAME ${testname}
-      COMMAND ${testscript} ${ARGN}
-    )
-  endif()
-endfunction()
-
 if(WITH_CYCLES OR WITH_OPENGL_RENDER_TESTS)
   if(NOT OPENIMAGEIO_IDIFF)
     MESSAGE(STATUS "Disabling render tests because OIIO idiff does not exist")
@@ -633,9 +592,8 @@ if(WITH_ALEMBIC)
     --alembic-root "${ALEMBIC_ROOT_DIR}"
   )
 
-  add_test(
-    NAME script_alembic_import
-    COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
+  add_blender_test(
+    script_alembic_import
     --python ${CMAKE_CURRENT_LIST_DIR}/bl_alembic_import_test.py
     --
     --testdir "${TEST_SRC_DIR}/alembic"