Skip to content

Commit

Permalink
Fix recently-added testUsdAbcIndexedGeomArb
Browse files Browse the repository at this point in the history
Invoke usdcat directly instead of going through the
test script which simply does the same thing. This
is similar to how the usdcat tests are set up and
avoids issues where usdcat may not be in the PATH
when the test is run.

See #1635

(Internal change: 2217289)
  • Loading branch information
sunyab authored and pixar-oss committed Feb 24, 2022
1 parent 1c8674f commit 169463e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 42 deletions.
7 changes: 3 additions & 4 deletions pxr/usd/plugin/usdAbc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ pxr_test_scripts(
testenv/testUsdAbcConversionSubdiv.py
testenv/testUsdAbcFaceset.py
testenv/testUsdAbcIndexedProperties.py
testenv/testUsdAbcIndexedGeomArb.py
testenv/testUsdAbcInstancing.py
testenv/testUsdAbcIsConstant.py
testenv/testUsdAbcP_OldEncoding.py
Expand Down Expand Up @@ -115,8 +114,8 @@ pxr_install_test_dir(
)

pxr_install_test_dir(
SRC testenv/testUsdAbcIndexedGeomArb
DEST testUsdAbcIndexedGeomArb
SRC testenv/testUsdAbcIndexedGeomArb
DEST testUsdAbcIndexedGeomArb
)

pxr_install_test_dir(
Expand Down Expand Up @@ -213,7 +212,7 @@ pxr_register_test(testUsdAbcIndexedProperties

pxr_register_test(testUsdAbcIndexedGeomArb
PYTHON
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdAbcIndexedGeomArb"
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdcat hasColorSet.abc --out good_primvars_namespace_after_fix.usda"
DIFF_COMPARE good_primvars_namespace_after_fix.usda
EXPECTED_RETURN_CODE 0
ENV
Expand Down
38 changes: 0 additions & 38 deletions pxr/usd/plugin/usdAbc/testenv/testUsdAbcIndexedGeomArb.py

This file was deleted.

0 comments on commit 169463e

Please # to comment.