From 96e6e49961566ad9fec7cd04eb1ec65a1c6f3e16 Mon Sep 17 00:00:00 2001 From: Matt Johnson Date: Mon, 24 Aug 2020 18:55:19 -0700 Subject: [PATCH 1/2] migrate testProxyShapeDrawPurpose test from plugin/pxr/... to test/lib/mayaUsd/render/pxrUsdMayaGL/... --- test/lib/mayaUsd/render/pxrUsdMayaGL/CMakeLists.txt | 1 + .../ProxyShapeDrawPurposeTest.ma | 0 .../ProxyShapeDrawPurposeTest/PurposeCubes.usda | 0 .../ProxyShapeDrawPurposeTest_allTogglesOff.png | Bin .../ProxyShapeDrawPurposeTest_allTogglesOn.png | Bin .../ProxyShapeDrawPurposeTest_guideToggleOn.png | Bin .../ProxyShapeDrawPurposeTest_proxyToggleOn.png | Bin .../ProxyShapeDrawPurposeTest_renderToggleOn.png | Bin .../pxrUsdMayaGL}/testProxyShapeDrawPurpose.py | 3 ++- 9 files changed, 3 insertions(+), 1 deletion(-) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawPurposeTest/ProxyShapeDrawPurposeTest.ma (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawPurposeTest/PurposeCubes.usda (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_allTogglesOff.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_allTogglesOn.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_guideToggleOn.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_proxyToggleOn.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_renderToggleOn.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/testProxyShapeDrawPurpose.py (97%) diff --git a/test/lib/mayaUsd/render/pxrUsdMayaGL/CMakeLists.txt b/test/lib/mayaUsd/render/pxrUsdMayaGL/CMakeLists.txt index 3a78a7a945..8554c0d3cc 100644 --- a/test/lib/mayaUsd/render/pxrUsdMayaGL/CMakeLists.txt +++ b/test/lib/mayaUsd/render/pxrUsdMayaGL/CMakeLists.txt @@ -2,6 +2,7 @@ set(TARGET_NAME MAYAUSD_RENDER_PXRUSDMAYAGL_TEST) # Unit test scripts. set(TEST_SCRIPT_FILES + testProxyShapeDrawPurpose.py testPxrUsdMayaGL.py ) diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawPurposeTest/ProxyShapeDrawPurposeTest.ma b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawPurposeTest/ProxyShapeDrawPurposeTest.ma similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawPurposeTest/ProxyShapeDrawPurposeTest.ma rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawPurposeTest/ProxyShapeDrawPurposeTest.ma diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawPurposeTest/PurposeCubes.usda b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawPurposeTest/PurposeCubes.usda similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawPurposeTest/PurposeCubes.usda rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawPurposeTest/PurposeCubes.usda diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_allTogglesOff.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_allTogglesOff.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_allTogglesOff.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_allTogglesOff.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_allTogglesOn.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_allTogglesOn.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_allTogglesOn.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_allTogglesOn.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_guideToggleOn.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_guideToggleOn.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_guideToggleOn.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_guideToggleOn.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_proxyToggleOn.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_proxyToggleOn.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_proxyToggleOn.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_proxyToggleOn.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_renderToggleOn.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_renderToggleOn.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_renderToggleOn.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawPurposeTest/baseline/ProxyShapeDrawPurposeTest_renderToggleOn.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/testProxyShapeDrawPurpose.py b/test/lib/mayaUsd/render/pxrUsdMayaGL/testProxyShapeDrawPurpose.py similarity index 97% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/testProxyShapeDrawPurpose.py rename to test/lib/mayaUsd/render/pxrUsdMayaGL/testProxyShapeDrawPurpose.py index 967f647251..1e110a0481 100644 --- a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/testProxyShapeDrawPurpose.py +++ b/test/lib/mayaUsd/render/pxrUsdMayaGL/testProxyShapeDrawPurpose.py @@ -75,7 +75,8 @@ def testDrawAndToggleDrawPurposeAttributes(self): self._testName = 'ProxyShapeDrawPurposeTest' mayaSceneFile = '%s.ma' % self._testName - mayaSceneFullPath = os.path.abspath(mayaSceneFile) + mayaSceneFullPath = os.path.abspath( + os.path.join('ProxyShapeDrawPurposeTest', mayaSceneFile)) cmds.file(mayaSceneFullPath, open=True, force=True) # Force an initial draw to complete by switching frames. From 3ec277cbb1e5b9a2fa7f9bc428f97ec29ba9fc70 Mon Sep 17 00:00:00 2001 From: Matt Johnson Date: Mon, 24 Aug 2020 18:57:28 -0700 Subject: [PATCH 2/2] migrate testProxyShapeDrawLighting test from plugin/pxr/... to test/lib/mayaUsd/render/pxrUsdMayaGL/... --- test/lib/mayaUsd/render/pxrUsdMayaGL/CMakeLists.txt | 1 + .../ProxyShapeDrawLightingTest/PlaneModel.usda | 0 .../ProxyShapeDrawLightingTest.ma | 0 .../ProxyShapeDrawLightingTest/TorusModel.usda | 0 .../baseline/Directional_1.png | Bin .../baseline/Directional_2.png | Bin .../baseline/Directional_3.png | Bin .../baseline/Directional_4.png | Bin .../baseline/HydraShadows_Directional_1.png | Bin .../baseline/HydraShadows_Directional_2.png | Bin .../baseline/HydraShadows_Directional_3.png | Bin .../baseline/HydraShadows_Directional_4.png | Bin .../baseline/HydraShadows_Spot_1.png | Bin .../baseline/HydraShadows_Spot_2.png | Bin .../baseline/HydraShadows_Spot_3.png | Bin .../baseline/HydraShadows_Spot_4.png | Bin .../baseline/MayaNativeShadows_Directional_1.png | Bin .../baseline/MayaNativeShadows_Directional_2.png | Bin .../baseline/MayaNativeShadows_Directional_3.png | Bin .../baseline/MayaNativeShadows_Directional_4.png | Bin .../baseline/MayaNativeShadows_Spot_1.png | Bin .../baseline/MayaNativeShadows_Spot_2.png | Bin .../baseline/MayaNativeShadows_Spot_3.png | Bin .../baseline/MayaNativeShadows_Spot_4.png | Bin .../ProxyShapeDrawLightingTest/baseline/Spot_1.png | Bin .../ProxyShapeDrawLightingTest/baseline/Spot_2.png | Bin .../ProxyShapeDrawLightingTest/baseline/Spot_3.png | Bin .../ProxyShapeDrawLightingTest/baseline/Spot_4.png | Bin .../pxrUsdMayaGL}/testProxyShapeDrawLighting.py | 3 ++- 29 files changed, 3 insertions(+), 1 deletion(-) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/PlaneModel.usda (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/ProxyShapeDrawLightingTest.ma (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/TorusModel.usda (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/Directional_1.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/Directional_2.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/Directional_3.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/Directional_4.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_1.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_2.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_3.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_4.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_1.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_2.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_3.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_4.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_1.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_2.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_3.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_4.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_1.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_2.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_3.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_4.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/Spot_1.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/Spot_2.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/Spot_3.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/ProxyShapeDrawLightingTest/baseline/Spot_4.png (100%) rename {plugin/pxr/maya/lib/pxrUsdMayaGL/testenv => test/lib/mayaUsd/render/pxrUsdMayaGL}/testProxyShapeDrawLighting.py (98%) diff --git a/test/lib/mayaUsd/render/pxrUsdMayaGL/CMakeLists.txt b/test/lib/mayaUsd/render/pxrUsdMayaGL/CMakeLists.txt index 8554c0d3cc..bcb2d61e7e 100644 --- a/test/lib/mayaUsd/render/pxrUsdMayaGL/CMakeLists.txt +++ b/test/lib/mayaUsd/render/pxrUsdMayaGL/CMakeLists.txt @@ -2,6 +2,7 @@ set(TARGET_NAME MAYAUSD_RENDER_PXRUSDMAYAGL_TEST) # Unit test scripts. set(TEST_SCRIPT_FILES + testProxyShapeDrawLighting.py testProxyShapeDrawPurpose.py testPxrUsdMayaGL.py ) diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/PlaneModel.usda b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/PlaneModel.usda similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/PlaneModel.usda rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/PlaneModel.usda diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/ProxyShapeDrawLightingTest.ma b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/ProxyShapeDrawLightingTest.ma similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/ProxyShapeDrawLightingTest.ma rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/ProxyShapeDrawLightingTest.ma diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/TorusModel.usda b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/TorusModel.usda similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/TorusModel.usda rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/TorusModel.usda diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Directional_1.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Directional_1.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Directional_1.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Directional_1.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Directional_2.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Directional_2.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Directional_2.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Directional_2.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Directional_3.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Directional_3.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Directional_3.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Directional_3.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Directional_4.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Directional_4.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Directional_4.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Directional_4.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_1.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_1.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_1.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_1.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_2.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_2.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_2.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_2.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_3.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_3.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_3.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_3.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_4.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_4.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_4.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Directional_4.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_1.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_1.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_1.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_1.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_2.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_2.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_2.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_2.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_3.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_3.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_3.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_3.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_4.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_4.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_4.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/HydraShadows_Spot_4.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_1.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_1.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_1.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_1.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_2.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_2.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_2.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_2.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_3.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_3.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_3.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_3.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_4.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_4.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_4.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Directional_4.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_1.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_1.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_1.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_1.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_2.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_2.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_2.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_2.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_3.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_3.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_3.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_3.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_4.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_4.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_4.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/MayaNativeShadows_Spot_4.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Spot_1.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Spot_1.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Spot_1.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Spot_1.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Spot_2.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Spot_2.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Spot_2.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Spot_2.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Spot_3.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Spot_3.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Spot_3.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Spot_3.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Spot_4.png b/test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Spot_4.png similarity index 100% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/ProxyShapeDrawLightingTest/baseline/Spot_4.png rename to test/lib/mayaUsd/render/pxrUsdMayaGL/ProxyShapeDrawLightingTest/baseline/Spot_4.png diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/testProxyShapeDrawLighting.py b/test/lib/mayaUsd/render/pxrUsdMayaGL/testProxyShapeDrawLighting.py similarity index 98% rename from plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/testProxyShapeDrawLighting.py rename to test/lib/mayaUsd/render/pxrUsdMayaGL/testProxyShapeDrawLighting.py index 5e4a5bfc08..f339c71c30 100644 --- a/plugin/pxr/maya/lib/pxrUsdMayaGL/testenv/testProxyShapeDrawLighting.py +++ b/test/lib/mayaUsd/render/pxrUsdMayaGL/testProxyShapeDrawLighting.py @@ -34,7 +34,8 @@ def setUpClass(cls): cls._testRootNodeName = 'ProxyShapeDrawLightingTest' cls._testSceneName = '%s.ma' % cls._testRootNodeName - cls._testSceneFullPath = os.path.abspath(cls._testSceneName) + cls._testSceneFullPath = os.path.abspath( + os.path.join('ProxyShapeDrawLightingTest', cls._testSceneName)) cls._nativeNodePathName = '|%s|Native' % cls._testRootNodeName cls._nativeTorusPathName = '%s|Torus' % cls._nativeNodePathName