Merge pull request #409 from AnimalLogic/ALRezTestsDev1

Update mayaUsd_add_test macro calls in AL plugin to add support for additional schema paths
Autodesk · Apr 8, 2020 · 1d77003 · 1d77003
2 parents 09306b9 + 3445524
commit 1d77003
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 2 deletions.
diff --git a/lib/usd/translators/CMakeLists.txt b/lib/usd/translators/CMakeLists.txt
@@ -140,4 +140,4 @@ if(IS_WINDOWS)
         DESTINATION ${library_install_path} OPTIONAL
     )
 endif()
-
+
diff --git a/plugin/al/mayautils/AL/maya/tests/mayaplugintest/CMakeLists.txt b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/CMakeLists.txt
@@ -90,4 +90,5 @@ mayaUsd_add_test(${TARGET_NAME}
     PYTHON_COMMAND "${pycode}"
     ENV
         "MAYA_PLUG_IN_PATH=${MAYAUTILS_TEST_MAYAPLUGIN_INSTALL_PATH}"
-)
+        "PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
+)
diff --git a/plugin/al/plugin/AL_USDMayaTestPlugin/CMakeLists.txt b/plugin/al/plugin/AL_USDMayaTestPlugin/CMakeLists.txt
@@ -132,6 +132,8 @@ sys.exit(maya.cmds.AL_maya_test_UnitTestHarness())
 
 mayaUsd_add_test(${TARGET_NAME}
     PYTHON_COMMAND "${pycode}"
+    ENV
+        "PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
 )
 
 if(NOT SKIP_USDMAYA_TESTS)

diff --git a/plugin/al/plugin/AL_USDMayaTestPlugin/py/CMakeLists.txt b/plugin/al/plugin/AL_USDMayaTestPlugin/py/CMakeLists.txt
@@ -1,16 +1,24 @@
 mayaUsd_add_test(TestALUSDMayaPython_ProxyShape
     PYTHON_MODULE testProxyShape
+    ENV
+        "PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
 )
 
 mayaUsd_add_test(TestALUSDMayaPython_Translators
     PYTHON_MODULE testTranslators
+    ENV
+        "PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
 )
 
 mayaUsd_add_test(TestALUSDMayaPython_LayerManager
     PYTHON_MODULE testLayerManager
+    ENV
+        "PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
 )
 
 mayaUsd_add_test(TestALUSDMayaPython_ImportModule
     PYTHON_MODULE testUSDMayaPythonModuleOnly
+    ENV
+        "PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
     NO_STANDALONE_INIT
 )
diff --git a/plugin/al/schemas/AL/usd/schemas/maya/tests/CMakeLists.txt b/plugin/al/schemas/AL/usd/schemas/maya/tests/CMakeLists.txt
@@ -46,4 +46,6 @@ endif()
 
 mayaUsd_add_test(${TARGET_NAME}
     COMMAND $<TARGET_FILE:${TARGET_NAME}>
+    ENV
+        "PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
 )
diff --git a/plugin/al/translators/pxrUsdTranslators/tests/CMakeLists.txt b/plugin/al/translators/pxrUsdTranslators/tests/CMakeLists.txt
@@ -5,4 +5,5 @@ mayaUsd_add_test(${TEST_NAME}
     ENV
         "PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}"
         "TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}"
+        "PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
 )
diff --git a/plugin/al/translators/tests/CMakeLists.txt b/plugin/al/translators/tests/CMakeLists.txt
@@ -1,3 +1,5 @@
 mayaUsd_add_test(TestAdditionalTranslators
     PYTHON_MODULE testTranslators
+    ENV
+        "PXR_PLUGINPATH_NAME=${ADDITIONAL_PXR_PLUGINPATH_NAME}"
 )