Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HYDRA-1207 - fix and re-enable case testSceneBrowser #182

Merged
merged 3 commits into from
Oct 3, 2024
Merged

HYDRA-1207 - fix and re-enable case testSceneBrowser #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c375deb
adjust test code in sceneBrowser to make the case happy on SdfPathVec…
lilike-adsk Oct 2, 2024
42dc7ed
fix the build failure on old USD version for Maya 2025
lilike-adsk Oct 2, 2024
00d4442
update the comment
lilike-adsk Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions lib/adskHydraSceneBrowser/test/adskHydraSceneBrowserTestFixture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,21 @@ void AdskHydraSceneBrowserTestFixture::CompareValueContent(const pxr::VtValue& v
std::string actualValue = valueText.toStdString();

std::ostringstream valueStream;
#if PXR_VERSION < 2408
valueStream << value;
#else
if (value.IsHolding<pxr::SdfPathVector>()) {
lilike-adsk marked this conversation as resolved.
Show resolved Hide resolved
// Special case for SdfPathVector.
// See https://github.com/PixarAnimationStudios/OpenUSD/commit/1d19b1d
pxr::SdfPathVector paths = value.Get<pxr::SdfPathVector>();
for (pxr::SdfPath const& path : paths) {
valueStream << path << "\n";
}
}
else {
valueStream << value;
}
#endif
std::string expectedValue = valueStream.str();

if (!MatchesFallbackTextOutput(expectedValue)) {
Expand Down
3 changes: 1 addition & 2 deletions test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ endif(MayaUsd_FOUND)

# Code coverage is not computed for the Hydra scene browser.
if (NOT CODE_COVERAGE)
# To be reenabled after investigation: HYDRA-1207
#list(APPEND INTERACTIVE_TEST_SCRIPT_FILES testSceneBrowser.py)
list(APPEND INTERACTIVE_TEST_SCRIPT_FILES testSceneBrowser.py)
endif()

# Interactive Unit test scripts for mesh adapter (launched with maya.exe instead of mayapy.exe)
Expand Down