From: pixar-oss Date: Mon, 22 Jan 2024 22:32:08 +0000 (-0800) Subject: PcpMuseum test output/baseline cleanup: removing all remaining "_pcp" X-Git-Tag: accepted/tizen/unified/x/20250428.070456~5^2~66 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3851ed5633941c36a7a25a8c70b98f15ab645802;p=platform%2Fcore%2Fuifw%2FOpenUSD.git PcpMuseum test output/baseline cleanup: removing all remaining "_pcp" suffixes from output file and baselines. This required renaming existing baseline files using the "_pcp" suffix to text files without the suffix. In some cases, the suffixless baseline didn't exist already so a simple perforce rename was all that was required. In other cases the suffixless file did exist but was not being used anymore. These files were updated to match the "_pcp" baseline (if they didn't already) and the "_pcp" baseline deleted. (Internal change: 2311696) --- diff --git a/pxr/usd/pcp/CMakeLists.txt b/pxr/usd/pcp/CMakeLists.txt index a4376f0a8..c5479b47f 100644 --- a/pxr/usd/pcp/CMakeLists.txt +++ b/pxr/usd/pcp/CMakeLists.txt @@ -1015,8 +1015,8 @@ pxr_register_test(testPcpMuseum_BasicAncestralReference pxr_register_test(testPcpMuseum_BasicReferenceDiamond PYTHON COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults BasicReferenceDiamond/root.sdf" - STDOUT_REDIRECT compositionResults_BasicReferenceDiamond_pcp.txt - DIFF_COMPARE compositionResults_BasicReferenceDiamond_pcp.txt + STDOUT_REDIRECT compositionResults_BasicReferenceDiamond.txt + DIFF_COMPARE compositionResults_BasicReferenceDiamond.txt ) pxr_register_test(testPcpMuseum_BasicRelocateToAnimInterface @@ -1052,8 +1052,8 @@ pxr_register_test(testPcpMuseum_BasicListEditing pxr_register_test(testPcpMuseum_BasicListEditingWithInherits PYTHON COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults BasicListEditingWithInherits/root.sdf" - STDOUT_REDIRECT compositionResults_BasicListEditingWithInherits_pcp.txt - DIFF_COMPARE compositionResults_BasicListEditingWithInherits_pcp.txt + STDOUT_REDIRECT compositionResults_BasicListEditingWithInherits.txt + DIFF_COMPARE compositionResults_BasicListEditingWithInherits.txt ) pxr_register_test(testPcpMuseum_BasicDuplicateSublayer @@ -1080,8 +1080,8 @@ pxr_register_test(testPcpMuseum_BasicNestedPayload pxr_register_test(testPcpMuseum_BasicNestedVariants PYTHON COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults BasicNestedVariants/root.sdf" - STDOUT_REDIRECT compositionResults_BasicNestedVariants_pcp.txt - DIFF_COMPARE compositionResults_BasicNestedVariants_pcp.txt + STDOUT_REDIRECT compositionResults_BasicNestedVariants.txt + DIFF_COMPARE compositionResults_BasicNestedVariants.txt ) pxr_register_test(testPcpMuseum_BasicNestedVariantsWithSameName @@ -1114,9 +1114,9 @@ pxr_register_test(testPcpMuseum_BasicOwner pxr_register_test(testPcpMuseum_BasicPayload PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --session BasicPayload/session.sdf --errorFile compositionErrors_BasicPayload_pcp.txt BasicPayload/root.sdf" - STDOUT_REDIRECT compositionResults_BasicPayload_pcp.txt - DIFF_COMPARE compositionResults_BasicPayload_pcp.txt compositionErrors_BasicPayload_pcp.txt + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --session BasicPayload/session.sdf --errorFile compositionErrors_BasicPayload.txt BasicPayload/root.sdf" + STDOUT_REDIRECT compositionResults_BasicPayload.txt + DIFF_COMPARE compositionResults_BasicPayload.txt compositionErrors_BasicPayload.txt ) pxr_register_test(testPcpMuseum_BasicSpecializes @@ -1422,8 +1422,8 @@ pxr_register_test(testPcpMuseum_TypicalReferenceToRiggedModel pxr_register_test(testPcpMuseum_TypicalReferenceToChargroup PYTHON COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults TypicalReferenceToChargroup/root.sdf" - STDOUT_REDIRECT compositionResults_TypicalReferenceToChargroup_pcp.txt - DIFF_COMPARE compositionResults_TypicalReferenceToChargroup_pcp.txt + STDOUT_REDIRECT compositionResults_TypicalReferenceToChargroup.txt + DIFF_COMPARE compositionResults_TypicalReferenceToChargroup.txt ) pxr_register_test(testPcpMuseum_TypicalReferenceToChargroupWithRename @@ -1443,8 +1443,8 @@ pxr_register_test(testPcpMuseum_TrickyListEditedTargetPaths pxr_register_test(testPcpMuseum_TrickySpookyInherits PYTHON COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults TrickySpookyInherits/root.sdf" - STDOUT_REDIRECT compositionResults_TrickySpookyInherits_pcp.txt - DIFF_COMPARE compositionResults_TrickySpookyInherits_pcp.txt + STDOUT_REDIRECT compositionResults_TrickySpookyInherits.txt + DIFF_COMPARE compositionResults_TrickySpookyInherits.txt ) pxr_register_test(testPcpMuseum_TrickySpookyInheritsInSymmetricArmRig @@ -1513,15 +1513,15 @@ pxr_register_test(testPcpMuseum_SubrootReferenceNonCycle pxr_register_test(testPcpMuseum_TrickyVariantAncestralSelection PYTHON COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults TrickyVariantAncestralSelection/root.sdf" - STDOUT_REDIRECT compositionResults_TrickyVariantAncestralSelection_pcp.txt - DIFF_COMPARE compositionResults_TrickyVariantAncestralSelection_pcp.txt + STDOUT_REDIRECT compositionResults_TrickyVariantAncestralSelection.txt + DIFF_COMPARE compositionResults_TrickyVariantAncestralSelection.txt ) pxr_register_test(testPcpMuseum_TrickyVariantIndependentSelection PYTHON COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults TrickyVariantIndependentSelection/root.sdf" - STDOUT_REDIRECT compositionResults_TrickyVariantIndependentSelection_pcp.txt - DIFF_COMPARE compositionResults_TrickyVariantIndependentSelection_pcp.txt + STDOUT_REDIRECT compositionResults_TrickyVariantIndependentSelection.txt + DIFF_COMPARE compositionResults_TrickyVariantIndependentSelection.txt ) pxr_register_test(testPcpMuseum_TrickyVariantInPayload @@ -1548,15 +1548,15 @@ pxr_register_test(testPcpMuseum_TrickyVariantOverrideOfRelocatedPrim pxr_register_test(testPcpMuseum_TrickyVariantSelectionInVariant PYTHON COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults TrickyVariantSelectionInVariant/root.sdf" - STDOUT_REDIRECT compositionResults_TrickyVariantSelectionInVariant_pcp.txt - DIFF_COMPARE compositionResults_TrickyVariantSelectionInVariant_pcp.txt + STDOUT_REDIRECT compositionResults_TrickyVariantSelectionInVariant.txt + DIFF_COMPARE compositionResults_TrickyVariantSelectionInVariant.txt ) pxr_register_test(testPcpMuseum_TrickyVariantWeakerSelection PYTHON COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults TrickyVariantWeakerSelection/root.sdf" - STDOUT_REDIRECT compositionResults_TrickyVariantWeakerSelection_pcp.txt - DIFF_COMPARE compositionResults_TrickyVariantWeakerSelection_pcp.txt + STDOUT_REDIRECT compositionResults_TrickyVariantWeakerSelection.txt + DIFF_COMPARE compositionResults_TrickyVariantWeakerSelection.txt ) pxr_register_test(testPcpMuseum_TrickyVariantWeakerSelection2 @@ -1667,8 +1667,8 @@ pxr_register_test(testPcpMuseum_TrickySpecializesAndRelocates pxr_register_test(testPcpMuseum_TrickySpookyVariantSelection PYTHON COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults TrickySpookyVariantSelection/root.sdf" - STDOUT_REDIRECT compositionResults_TrickySpookyVariantSelection_pcp.txt - DIFF_COMPARE compositionResults_TrickySpookyVariantSelection_pcp.txt + STDOUT_REDIRECT compositionResults_TrickySpookyVariantSelection.txt + DIFF_COMPARE compositionResults_TrickySpookyVariantSelection.txt ) # Temporarily disable pending bug fix @@ -1676,8 +1676,8 @@ if (FALSE) pxr_register_test(testPcpMuseum_TrickySpookyVariantSelectionInClass PYTHON COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults TrickySpookyVariantSelectionInClass/root.sdf" - STDOUT_REDIRECT compositionResults_TrickySpookyVariantSelectionInClass_pcp.txt - DIFF_COMPARE compositionResults_TrickySpookyVariantSelectionInClass_pcp.txt + STDOUT_REDIRECT compositionResults_TrickySpookyVariantSelectionInClass.txt + DIFF_COMPARE compositionResults_TrickySpookyVariantSelectionInClass.txt ) endif() @@ -1698,15 +1698,15 @@ pxr_register_test(testPcpMuseum_TrickyRelocatedTargetInVariant pxr_register_test(testPcpMuseum_TrickyRelocationOfPrimFromPayload PYTHON COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults TrickyRelocationOfPrimFromPayload/root.sdf" - STDOUT_REDIRECT compositionResults_TrickyRelocationOfPrimFromPayload_pcp.txt - DIFF_COMPARE compositionResults_TrickyRelocationOfPrimFromPayload_pcp.txt + STDOUT_REDIRECT compositionResults_TrickyRelocationOfPrimFromPayload.txt + DIFF_COMPARE compositionResults_TrickyRelocationOfPrimFromPayload.txt ) pxr_register_test(testPcpMuseum_TrickyRelocationOfPrimFromVariant PYTHON COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults TrickyRelocationOfPrimFromVariant/root.sdf" - STDOUT_REDIRECT compositionResults_TrickyRelocationOfPrimFromVariant_pcp.txt - DIFF_COMPARE compositionResults_TrickyRelocationOfPrimFromVariant_pcp.txt + STDOUT_REDIRECT compositionResults_TrickyRelocationOfPrimFromVariant.txt + DIFF_COMPARE compositionResults_TrickyRelocationOfPrimFromVariant.txt ) pxr_register_test(testPcpMuseum_TrickyRelocationSquatter @@ -1767,16 +1767,16 @@ pxr_register_test(testPcpMuseum_TrickyNonLocalVariantSelection pxr_register_test(testPcpMuseum_ErrorOpinionAtRelocationSource PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --errorFile compositionErrors_ErrorOpinionAtRelocationSource_pcp.txt ErrorOpinionAtRelocationSource/root.sdf" + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --errorFile compositionErrors_ErrorOpinionAtRelocationSource.txt ErrorOpinionAtRelocationSource/root.sdf" STDOUT_REDIRECT compositionResults_ErrorOpinionAtRelocationSource.txt DIFF_COMPARE compositionResults_ErrorOpinionAtRelocationSource.txt ) pxr_register_test(testPcpMuseum_ErrorRelocateToSelf PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --errorFile compositionErrors_ErrorRelocateToSelf_pcp.txt ErrorRelocateToSelf/root.sdf" - STDOUT_REDIRECT compositionResults_ErrorRelocateToSelf_pcp.txt - DIFF_COMPARE compositionResults_ErrorRelocateToSelf_pcp.txt compositionErrors_ErrorRelocateToSelf_pcp.txt + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --errorFile compositionErrors_ErrorRelocateToSelf.txt ErrorRelocateToSelf/root.sdf" + STDOUT_REDIRECT compositionResults_ErrorRelocateToSelf.txt + DIFF_COMPARE compositionResults_ErrorRelocateToSelf.txt compositionErrors_ErrorRelocateToSelf.txt ) pxr_register_test(testPcpMuseum_ErrorRelocateWithVariantSelection diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicListEditingWithInherits.testenv/baseline/compositionResults_BasicListEditingWithInherits.txt b/pxr/usd/pcp/testenv/testPcpMuseum_BasicListEditingWithInherits.testenv/baseline/compositionResults_BasicListEditingWithInherits.txt index e06ec66d0..308a5c96f 100644 --- a/pxr/usd/pcp/testenv/testPcpMuseum_BasicListEditingWithInherits.testenv/baseline/compositionResults_BasicListEditingWithInherits.txt +++ b/pxr/usd/pcp/testenv/testPcpMuseum_BasicListEditingWithInherits.testenv/baseline/compositionResults_BasicListEditingWithInherits.txt @@ -43,17 +43,17 @@ Prim Stack: model.sdf /Model/SymRig Child names: - ['C2', 'C1'] + ['C1', 'C2'] ------------------------------------------------------------------------ -Results for composing +Results for composing Prim Stack: - model.sdf /Model/SymRig/C2 + model.sdf /Model/SymRig/C1 ------------------------------------------------------------------------ -Results for composing +Results for composing Prim Stack: - model.sdf /Model/SymRig/C1 + model.sdf /Model/SymRig/C2 diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicListEditingWithInherits.testenv/baseline/compositionResults_BasicListEditingWithInherits_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_BasicListEditingWithInherits.testenv/baseline/compositionResults_BasicListEditingWithInherits_pcp.txt deleted file mode 100644 index 308a5c96f..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_BasicListEditingWithInherits.testenv/baseline/compositionResults_BasicListEditingWithInherits_pcp.txt +++ /dev/null @@ -1,59 +0,0 @@ -Loading @BasicListEditingWithInherits/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Model - model.sdf /Model - -Child names: - ['SymRig', 'LeftRig'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - model.sdf /Model/SymRig - -Child names: - ['C2', 'C1'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - model.sdf /Model/SymRig/C2 - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - model.sdf /Model/SymRig/C1 - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - model.sdf /Model/LeftRig - model.sdf /Model/SymRig - -Child names: - ['C1', 'C2'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - model.sdf /Model/SymRig/C1 - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - model.sdf /Model/SymRig/C2 - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicNestedVariants.testenv/baseline/compositionResults_BasicNestedVariants.txt b/pxr/usd/pcp/testenv/testPcpMuseum_BasicNestedVariants.testenv/baseline/compositionResults_BasicNestedVariants.txt new file mode 100644 index 000000000..fa51398e5 --- /dev/null +++ b/pxr/usd/pcp/testenv/testPcpMuseum_BasicNestedVariants.testenv/baseline/compositionResults_BasicNestedVariants.txt @@ -0,0 +1,75 @@ +Loading @BasicNestedVariants/root.sdf@ + +------------------------------------------------------------------------ +Layer Stack: + root.sdf + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /Foo + root.sdf /Foo{which=A} + +Variant Selections: + {which = A} + +Child names: + ['A'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /Foo{which=A}A + +Child names: + ['Number'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /Foo{which=A}A/Number + root.sdf /Foo{which=A}A/Number{count=one} + +Variant Selections: + {count = one} + +Child names: + ['one'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /Foo{which=A}A/Number{count=one}one + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /DirectlyNestedVariants + root.sdf /DirectlyNestedVariants{standin=anim} + root.sdf /DirectlyNestedVariants{standin=anim}{shadingVariant=spooky} + root.sdf /DirectlyNestedVariants{standin=anim}{shadingVariant=spooky}{standin=anim} + +Variant Selections: + {shadingVariant = spooky} + {standin = anim} + +Child names: + ['anim_spooky_anim_sphere', 'anim_spooky_sphere'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /DirectlyNestedVariants{standin=anim}{shadingVariant=spooky}{standin=anim}anim_spooky_anim_sphere + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /DirectlyNestedVariants{standin=anim}{shadingVariant=spooky}anim_spooky_sphere + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicNestedVariants.testenv/baseline/compositionResults_BasicNestedVariants_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_BasicNestedVariants.testenv/baseline/compositionResults_BasicNestedVariants_pcp.txt deleted file mode 100644 index fa51398e5..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_BasicNestedVariants.testenv/baseline/compositionResults_BasicNestedVariants_pcp.txt +++ /dev/null @@ -1,75 +0,0 @@ -Loading @BasicNestedVariants/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Foo - root.sdf /Foo{which=A} - -Variant Selections: - {which = A} - -Child names: - ['A'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Foo{which=A}A - -Child names: - ['Number'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Foo{which=A}A/Number - root.sdf /Foo{which=A}A/Number{count=one} - -Variant Selections: - {count = one} - -Child names: - ['one'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Foo{which=A}A/Number{count=one}one - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /DirectlyNestedVariants - root.sdf /DirectlyNestedVariants{standin=anim} - root.sdf /DirectlyNestedVariants{standin=anim}{shadingVariant=spooky} - root.sdf /DirectlyNestedVariants{standin=anim}{shadingVariant=spooky}{standin=anim} - -Variant Selections: - {shadingVariant = spooky} - {standin = anim} - -Child names: - ['anim_spooky_anim_sphere', 'anim_spooky_sphere'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /DirectlyNestedVariants{standin=anim}{shadingVariant=spooky}{standin=anim}anim_spooky_anim_sphere - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /DirectlyNestedVariants{standin=anim}{shadingVariant=spooky}anim_spooky_sphere - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicPayload.testenv/baseline/compositionErrors_BasicPayload.txt b/pxr/usd/pcp/testenv/testPcpMuseum_BasicPayload.testenv/baseline/compositionErrors_BasicPayload.txt new file mode 100644 index 000000000..e69de29bb diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicPayload.testenv/baseline/compositionErrors_BasicPayload_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_BasicPayload.testenv/baseline/compositionErrors_BasicPayload_pcp.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicPayload.testenv/baseline/compositionResults_BasicPayload.txt b/pxr/usd/pcp/testenv/testPcpMuseum_BasicPayload.testenv/baseline/compositionResults_BasicPayload.txt new file mode 100644 index 000000000..bb450226e --- /dev/null +++ b/pxr/usd/pcp/testenv/testPcpMuseum_BasicPayload.testenv/baseline/compositionResults_BasicPayload.txt @@ -0,0 +1,298 @@ +Loading session @BasicPayload/session.sdf@ + +Loading @BasicPayload/root.sdf@ + +------------------------------------------------------------------------ +Layer Stack: + session.sdf + root.sdf + sublayer.sdf + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /InternalSublayerPayload + sublayer.sdf /InternalSublayerPayload + +Child names: + ['InternalSublayerPayload_Child'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /InternalSublayerPayload/InternalSublayerPayload_Child + sublayer.sdf /InternalSublayerPayload/InternalSublayerPayload_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + sublayer.sdf /PrimInSublayerWithInternalPayload + root.sdf /InternalSublayerPayload + sublayer.sdf /InternalSublayerPayload + +Child names: + ['InternalSublayerPayload_Child'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /InternalSublayerPayload/InternalSublayerPayload_Child + sublayer.sdf /InternalSublayerPayload/InternalSublayerPayload_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + sublayer.sdf /SublayerPrim + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + sublayer.sdf /PrimInSublayerWithInternalPayload2 + sublayer.sdf /SublayerPrim + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /SimplePayload + payload.sdf /SimplePayload + +Child names: + ['Child'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + payload.sdf /SimplePayload/Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /SimpleSubrootPayload + payload.sdf /SimplePayload/Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PrimWithPayloads + payload.sdf /SimplePayload + ref.sdf /PayloadPrimA + ref2.sdf /PrimC + ref2.sdf /PrimB + +Child names: + ['PrimB_Child', 'PrimC_Child', 'PrimA_Child', 'Child'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + ref2.sdf /PrimB/PrimB_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + ref2.sdf /PrimC/PrimC_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + ref.sdf /PayloadPrimA/PrimA_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + payload.sdf /SimplePayload/Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PrimB + +Child names: + ['PrimB_Child'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PrimB/PrimB_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PrimWithSelfPayload + root.sdf /InternalPayload + sublayer.sdf /InternalSublayerPayload + +Child names: + ['InternalSublayerPayload_Child', 'InternalPayload_Child'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + sublayer.sdf /InternalSublayerPayload/InternalSublayerPayload_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /InternalPayload/InternalPayload_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PrimWithInternalPayload + root.sdf /InternalPayload + session.sdf /InternalPayload2 + +Child names: + ['InternalPayload_Child'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /InternalPayload/InternalPayload_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /InternalPayload + +Child names: + ['InternalPayload_Child'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /InternalPayload/InternalPayload_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PrimWithDefaultPayloadTarget + defaultRef.sdf /Default + +Child names: + ['Default_Child'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + defaultRef.sdf /Default/Default_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PrimWithDefaultPayloadTarget2 + root.sdf /InternalPayload + +Child names: + ['InternalPayload_Child'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /InternalPayload/InternalPayload_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PayloadPrimWithSubrootInReference + ref.sdf /RefPrimA/PrimA_Child + ref2.sdf /PrimC/PrimC_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /RefPrimWithSubrootInReference + ref.sdf /RefPrimA/PrimA_Child + ref2.sdf /PrimC/PrimC_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PrimWithInternalSubrootPayload + root.sdf /InternalPayload/InternalPayload_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PrimWithPayloadsInVariants + root.sdf /PrimWithPayloadsInVariants{v=ref} + +Variant Selections: + {v = ref} + +Child names: + ['Ref', 'A', 'B'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PrimWithPayloadsInVariants{v=ref}Ref + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PrimWithPayloadsInVariants{v=ref}A + root.sdf /PrimWithPayloadsInVariants{v=ref}Ref + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PrimWithPayloadsInVariants/B + root.sdf /PrimWithPayloadsInVariants{v=ref}Ref + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PayloadPrimWithSubrootInPayload + ref.sdf /PayloadPrimA/PrimA_Child + ref2.sdf /PrimC/PrimC_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /RefPrimWithSubrootInPayload + ref.sdf /PayloadPrimA/PrimA_Child + ref2.sdf /PrimC/PrimC_Child + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + session.sdf /InternalPayload2 + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicPayload.testenv/baseline/compositionResults_BasicPayload_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_BasicPayload.testenv/baseline/compositionResults_BasicPayload_pcp.txt deleted file mode 100644 index bb450226e..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_BasicPayload.testenv/baseline/compositionResults_BasicPayload_pcp.txt +++ /dev/null @@ -1,298 +0,0 @@ -Loading session @BasicPayload/session.sdf@ - -Loading @BasicPayload/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - session.sdf - root.sdf - sublayer.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /InternalSublayerPayload - sublayer.sdf /InternalSublayerPayload - -Child names: - ['InternalSublayerPayload_Child'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /InternalSublayerPayload/InternalSublayerPayload_Child - sublayer.sdf /InternalSublayerPayload/InternalSublayerPayload_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - sublayer.sdf /PrimInSublayerWithInternalPayload - root.sdf /InternalSublayerPayload - sublayer.sdf /InternalSublayerPayload - -Child names: - ['InternalSublayerPayload_Child'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /InternalSublayerPayload/InternalSublayerPayload_Child - sublayer.sdf /InternalSublayerPayload/InternalSublayerPayload_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - sublayer.sdf /SublayerPrim - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - sublayer.sdf /PrimInSublayerWithInternalPayload2 - sublayer.sdf /SublayerPrim - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /SimplePayload - payload.sdf /SimplePayload - -Child names: - ['Child'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - payload.sdf /SimplePayload/Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /SimpleSubrootPayload - payload.sdf /SimplePayload/Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PrimWithPayloads - payload.sdf /SimplePayload - ref.sdf /PayloadPrimA - ref2.sdf /PrimC - ref2.sdf /PrimB - -Child names: - ['PrimB_Child', 'PrimC_Child', 'PrimA_Child', 'Child'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - ref2.sdf /PrimB/PrimB_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - ref2.sdf /PrimC/PrimC_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - ref.sdf /PayloadPrimA/PrimA_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - payload.sdf /SimplePayload/Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PrimB - -Child names: - ['PrimB_Child'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PrimB/PrimB_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PrimWithSelfPayload - root.sdf /InternalPayload - sublayer.sdf /InternalSublayerPayload - -Child names: - ['InternalSublayerPayload_Child', 'InternalPayload_Child'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - sublayer.sdf /InternalSublayerPayload/InternalSublayerPayload_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /InternalPayload/InternalPayload_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PrimWithInternalPayload - root.sdf /InternalPayload - session.sdf /InternalPayload2 - -Child names: - ['InternalPayload_Child'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /InternalPayload/InternalPayload_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /InternalPayload - -Child names: - ['InternalPayload_Child'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /InternalPayload/InternalPayload_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PrimWithDefaultPayloadTarget - defaultRef.sdf /Default - -Child names: - ['Default_Child'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - defaultRef.sdf /Default/Default_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PrimWithDefaultPayloadTarget2 - root.sdf /InternalPayload - -Child names: - ['InternalPayload_Child'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /InternalPayload/InternalPayload_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PayloadPrimWithSubrootInReference - ref.sdf /RefPrimA/PrimA_Child - ref2.sdf /PrimC/PrimC_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /RefPrimWithSubrootInReference - ref.sdf /RefPrimA/PrimA_Child - ref2.sdf /PrimC/PrimC_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PrimWithInternalSubrootPayload - root.sdf /InternalPayload/InternalPayload_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PrimWithPayloadsInVariants - root.sdf /PrimWithPayloadsInVariants{v=ref} - -Variant Selections: - {v = ref} - -Child names: - ['Ref', 'A', 'B'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PrimWithPayloadsInVariants{v=ref}Ref - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PrimWithPayloadsInVariants{v=ref}A - root.sdf /PrimWithPayloadsInVariants{v=ref}Ref - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PrimWithPayloadsInVariants/B - root.sdf /PrimWithPayloadsInVariants{v=ref}Ref - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PayloadPrimWithSubrootInPayload - ref.sdf /PayloadPrimA/PrimA_Child - ref2.sdf /PrimC/PrimC_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /RefPrimWithSubrootInPayload - ref.sdf /PayloadPrimA/PrimA_Child - ref2.sdf /PrimC/PrimC_Child - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - session.sdf /InternalPayload2 - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicReferenceDiamond.testenv/baseline/compositionResults_BasicReferenceDiamond.txt b/pxr/usd/pcp/testenv/testPcpMuseum_BasicReferenceDiamond.testenv/baseline/compositionResults_BasicReferenceDiamond.txt index 75762bc9b..e891f6674 100644 --- a/pxr/usd/pcp/testenv/testPcpMuseum_BasicReferenceDiamond.testenv/baseline/compositionResults_BasicReferenceDiamond.txt +++ b/pxr/usd/pcp/testenv/testPcpMuseum_BasicReferenceDiamond.testenv/baseline/compositionResults_BasicReferenceDiamond.txt @@ -12,9 +12,10 @@ Prim Stack: A.sdf /A C.sdf /C B.sdf /B + C.sdf /C Property names: - ['B_attr', 'C_attr', 'A_attr'] + ['C_attr', 'B_attr', 'A_attr'] Property stacks: /Root.A_attr: @@ -23,4 +24,5 @@ Property stacks: B.sdf /B.B_attr /Root.C_attr: C.sdf /C.C_attr + C.sdf /C.C_attr diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicReferenceDiamond.testenv/baseline/compositionResults_BasicReferenceDiamond_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_BasicReferenceDiamond.testenv/baseline/compositionResults_BasicReferenceDiamond_pcp.txt deleted file mode 100644 index e891f6674..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_BasicReferenceDiamond.testenv/baseline/compositionResults_BasicReferenceDiamond_pcp.txt +++ /dev/null @@ -1,28 +0,0 @@ -Loading @BasicReferenceDiamond/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Root - A.sdf /A - C.sdf /C - B.sdf /B - C.sdf /C - -Property names: - ['C_attr', 'B_attr', 'A_attr'] - -Property stacks: -/Root.A_attr: - A.sdf /A.A_attr -/Root.B_attr: - B.sdf /B.B_attr -/Root.C_attr: - C.sdf /C.C_attr - C.sdf /C.C_attr - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorArcCycle.testenv/baseline/compositionErrors_ErrorArcCycle.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorArcCycle.testenv/baseline/compositionErrors_ErrorArcCycle.txt new file mode 100644 index 000000000..44b5316cb --- /dev/null +++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorArcCycle.testenv/baseline/compositionErrors_ErrorArcCycle.txt @@ -0,0 +1,95 @@ +------------------------------------------------------------------------ +Errors while composing + +Cycle detected: +@ErrorArcCycle/root.sdf@ +references: +@ErrorArcCycle/A.sdf@ +which references: +@ErrorArcCycle/B.sdf@ +which CANNOT reference: +@ErrorArcCycle/A.sdf@ + + +------------------------------------------------------------------------ +Errors while composing + +Cycle detected: +@ErrorArcCycle/root.sdf@ +inherits from: +@ErrorArcCycle/root.sdf@ +which CANNOT inherit from: +@ErrorArcCycle/root.sdf@ + + +------------------------------------------------------------------------ +Errors while composing + +Cycle detected: +@ErrorArcCycle/root.sdf@ +inherits from: +@ErrorArcCycle/root.sdf@ +which CANNOT inherit from: +@ErrorArcCycle/root.sdf@ + + +------------------------------------------------------------------------ +Errors while composing + +Cycle detected: +@ErrorArcCycle/root.sdf@ +references: +@ErrorArcCycle/model.sdf@ +which CANNOT reference: +@ErrorArcCycle/root.sdf@ + + +------------------------------------------------------------------------ +Errors while composing + +Cycle detected: +@ErrorArcCycle/root.sdf@ +CANNOT inherit from: +@ErrorArcCycle/root.sdf@ + + +------------------------------------------------------------------------ +Errors while composing + +Cycle detected: +@ErrorArcCycle/root.sdf@ +inherits from: +@ErrorArcCycle/root.sdf@ +which CANNOT inherit from: +@ErrorArcCycle/root.sdf@ + + +------------------------------------------------------------------------ +Errors while composing + +Cycle detected: +@ErrorArcCycle/root.sdf@ +inherits from: +@ErrorArcCycle/root.sdf@ +which CANNOT inherit from: +@ErrorArcCycle/root.sdf@ + + +------------------------------------------------------------------------ +Errors while composing + +Cycle detected: +@ErrorArcCycle/root.sdf@ +CANNOT inherit from: +@ErrorArcCycle/root.sdf@ + + +------------------------------------------------------------------------ +Errors while composing + +Cycle detected: +@ErrorArcCycle/root.sdf@ +CANNOT inherit from: +@ErrorArcCycle/root.sdf@ + + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorArcCycle.testenv/baseline/compositionErrors_ErrorArcCycle_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorArcCycle.testenv/baseline/compositionErrors_ErrorArcCycle_pcp.txt deleted file mode 100644 index 44b5316cb..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorArcCycle.testenv/baseline/compositionErrors_ErrorArcCycle_pcp.txt +++ /dev/null @@ -1,95 +0,0 @@ ------------------------------------------------------------------------- -Errors while composing - -Cycle detected: -@ErrorArcCycle/root.sdf@ -references: -@ErrorArcCycle/A.sdf@ -which references: -@ErrorArcCycle/B.sdf@ -which CANNOT reference: -@ErrorArcCycle/A.sdf@ - - ------------------------------------------------------------------------- -Errors while composing - -Cycle detected: -@ErrorArcCycle/root.sdf@ -inherits from: -@ErrorArcCycle/root.sdf@ -which CANNOT inherit from: -@ErrorArcCycle/root.sdf@ - - ------------------------------------------------------------------------- -Errors while composing - -Cycle detected: -@ErrorArcCycle/root.sdf@ -inherits from: -@ErrorArcCycle/root.sdf@ -which CANNOT inherit from: -@ErrorArcCycle/root.sdf@ - - ------------------------------------------------------------------------- -Errors while composing - -Cycle detected: -@ErrorArcCycle/root.sdf@ -references: -@ErrorArcCycle/model.sdf@ -which CANNOT reference: -@ErrorArcCycle/root.sdf@ - - ------------------------------------------------------------------------- -Errors while composing - -Cycle detected: -@ErrorArcCycle/root.sdf@ -CANNOT inherit from: -@ErrorArcCycle/root.sdf@ - - ------------------------------------------------------------------------- -Errors while composing - -Cycle detected: -@ErrorArcCycle/root.sdf@ -inherits from: -@ErrorArcCycle/root.sdf@ -which CANNOT inherit from: -@ErrorArcCycle/root.sdf@ - - ------------------------------------------------------------------------- -Errors while composing - -Cycle detected: -@ErrorArcCycle/root.sdf@ -inherits from: -@ErrorArcCycle/root.sdf@ -which CANNOT inherit from: -@ErrorArcCycle/root.sdf@ - - ------------------------------------------------------------------------- -Errors while composing - -Cycle detected: -@ErrorArcCycle/root.sdf@ -CANNOT inherit from: -@ErrorArcCycle/root.sdf@ - - ------------------------------------------------------------------------- -Errors while composing - -Cycle detected: -@ErrorArcCycle/root.sdf@ -CANNOT inherit from: -@ErrorArcCycle/root.sdf@ - - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorConnectionPermissionDenied.testenv/ErrorConnectionPermissionDenied/baseline/compositionErrors_ErrorConnectionPermissionDenied.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorConnectionPermissionDenied.testenv/ErrorConnectionPermissionDenied/baseline/compositionErrors_ErrorConnectionPermissionDenied.txt new file mode 100644 index 000000000..b83995540 --- /dev/null +++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorConnectionPermissionDenied.testenv/ErrorConnectionPermissionDenied/baseline/compositionErrors_ErrorConnectionPermissionDenied.txt @@ -0,0 +1,19 @@ +------------------------------------------------------------------------ +Errors while composing + +The relationship target from in layer @ErrorConnectionPermissionDenied/root.sdf@ targets an object that is private on the far side of a reference or inherit. This target will be ignored. +The relationship target from in layer @ErrorConnectionPermissionDenied/root.sdf@ targets an object that is private on the far side of a reference or inherit. This target will be ignored. + +------------------------------------------------------------------------ +Errors while composing + +The relationship target from in layer @ErrorConnectionPermissionDenied/ref.sdf@ targets an object that is private on the far side of a reference or inherit. This target will be ignored. +The relationship target from in layer @ErrorConnectionPermissionDenied/ref.sdf@ targets an object that is private on the far side of a reference or inherit. This target will be ignored. +The relationship target from in layer @ErrorConnectionPermissionDenied/root.sdf@ targets an object that is private on the far side of a reference or inherit. This target will be ignored. +The relationship target from in layer @ErrorConnectionPermissionDenied/root.sdf@ targets an object that is private on the far side of a reference or inherit. This target will be ignored. + +------------------------------------------------------------------------ +Errors while composing + +The relationship target from in layer @ErrorConnectionPermissionDenied/culled_stable.sdf@ targets an object that is private on the far side of a reference or inherit. This target will be ignored. + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorConnectionPermissionDenied.testenv/ErrorConnectionPermissionDenied/baseline/compositionErrors_ErrorConnectionPermissionDenied_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorConnectionPermissionDenied.testenv/ErrorConnectionPermissionDenied/baseline/compositionErrors_ErrorConnectionPermissionDenied_pcp.txt deleted file mode 100644 index b83995540..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorConnectionPermissionDenied.testenv/ErrorConnectionPermissionDenied/baseline/compositionErrors_ErrorConnectionPermissionDenied_pcp.txt +++ /dev/null @@ -1,19 +0,0 @@ ------------------------------------------------------------------------- -Errors while composing - -The relationship target from in layer @ErrorConnectionPermissionDenied/root.sdf@ targets an object that is private on the far side of a reference or inherit. This target will be ignored. -The relationship target from in layer @ErrorConnectionPermissionDenied/root.sdf@ targets an object that is private on the far side of a reference or inherit. This target will be ignored. - ------------------------------------------------------------------------- -Errors while composing - -The relationship target from in layer @ErrorConnectionPermissionDenied/ref.sdf@ targets an object that is private on the far side of a reference or inherit. This target will be ignored. -The relationship target from in layer @ErrorConnectionPermissionDenied/ref.sdf@ targets an object that is private on the far side of a reference or inherit. This target will be ignored. -The relationship target from in layer @ErrorConnectionPermissionDenied/root.sdf@ targets an object that is private on the far side of a reference or inherit. This target will be ignored. -The relationship target from in layer @ErrorConnectionPermissionDenied/root.sdf@ targets an object that is private on the far side of a reference or inherit. This target will be ignored. - ------------------------------------------------------------------------- -Errors while composing - -The relationship target from in layer @ErrorConnectionPermissionDenied/culled_stable.sdf@ targets an object that is private on the far side of a reference or inherit. This target will be ignored. - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidPayload.testenv/ErrorInvalidPayload/baseline/compositionErrors_ErrorInvalidPayload.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidPayload.testenv/ErrorInvalidPayload/baseline/compositionErrors_ErrorInvalidPayload.txt new file mode 100644 index 000000000..f052bd742 --- /dev/null +++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidPayload.testenv/ErrorInvalidPayload/baseline/compositionErrors_ErrorInvalidPayload.txt @@ -0,0 +1,10 @@ +------------------------------------------------------------------------ +Errors while composing + +Could not open asset @ErrorInvalidPayload/payload_non_existent_file.sdf@ for payload introduced by @ErrorInvalidPayload/root.sdf@. + +------------------------------------------------------------------------ +Errors while composing + +Unresolved payload prim path @ErrorInvalidPayload/payload.sdf@ introduced by @ErrorInvalidPayload/root.sdf@ + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidPayload.testenv/ErrorInvalidPayload/baseline/compositionErrors_ErrorInvalidPayload_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidPayload.testenv/ErrorInvalidPayload/baseline/compositionErrors_ErrorInvalidPayload_pcp.txt deleted file mode 100644 index f052bd742..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidPayload.testenv/ErrorInvalidPayload/baseline/compositionErrors_ErrorInvalidPayload_pcp.txt +++ /dev/null @@ -1,10 +0,0 @@ ------------------------------------------------------------------------- -Errors while composing - -Could not open asset @ErrorInvalidPayload/payload_non_existent_file.sdf@ for payload introduced by @ErrorInvalidPayload/root.sdf@. - ------------------------------------------------------------------------- -Errors while composing - -Unresolved payload prim path @ErrorInvalidPayload/payload.sdf@ introduced by @ErrorInvalidPayload/root.sdf@ - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidPayload.testenv/ErrorInvalidPayload/baseline/compositionResults_ErrorInvalidPayload.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidPayload.testenv/ErrorInvalidPayload/baseline/compositionResults_ErrorInvalidPayload.txt index b2e6553b0..e0dd8ceed 100644 --- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidPayload.testenv/ErrorInvalidPayload/baseline/compositionResults_ErrorInvalidPayload.txt +++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidPayload.testenv/ErrorInvalidPayload/baseline/compositionResults_ErrorInvalidPayload.txt @@ -1,76 +1,18 @@ -Loading @ErrorInvalidTargetPath/root.sdf@ +Loading @ErrorInvalidPayload/root.sdf@ ------------------------------------------------------------------------ Layer Stack: root.sdf ------------------------------------------------------------------------ -Results for composing +Results for composing Prim Stack: - root.sdf /Root - root.sdf /_Class1 - A.sdf /A - -Property names: - ['A', 'B', 'prohibitedConnectionToInstance', 'x'] - -Property stacks: -/Root.A: - A.sdf /A.A -/Root.B: - A.sdf /A.B -/Root.prohibitedConnectionToInstance: - root.sdf /_Class1.prohibitedConnectionToInstance -/Root.x: - root.sdf /Root.x - -Attribute connections: -/Root.prohibitedConnectionToInstance: - /Root.x + root.sdf /BadPayload_NonExistentFile ------------------------------------------------------------------------ -Results for composing +Results for composing Prim Stack: - root.sdf /RootWithReferenceUnderVariant - root.sdf /RootWithReferenceUnderVariant{standin=anim} - A.sdf /A - -Variant Selections: - {standin = anim} - -Property names: - ['A', 'B'] - -Property stacks: -/RootWithReferenceUnderVariant.A: - A.sdf /A.A -/RootWithReferenceUnderVariant.B: - A.sdf /A.B - -Relationship targets: -/RootWithReferenceUnderVariant.B: - /PrimOutsideReferenceRoot - -Attribute connections: -/RootWithReferenceUnderVariant.A: - /PrimOutsideReferenceRoot.A - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_Class1 - -Property names: - ['prohibitedConnectionToInstance'] - -Property stacks: -/_Class1.prohibitedConnectionToInstance: - root.sdf /_Class1.prohibitedConnectionToInstance - -Attribute connections: -/_Class1.prohibitedConnectionToInstance: - /Root.x + root.sdf /BadPayload_NonExistentPrim diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidPayload.testenv/ErrorInvalidPayload/baseline/compositionResults_ErrorInvalidPayload_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidPayload.testenv/ErrorInvalidPayload/baseline/compositionResults_ErrorInvalidPayload_pcp.txt deleted file mode 100644 index e0dd8ceed..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidPayload.testenv/ErrorInvalidPayload/baseline/compositionResults_ErrorInvalidPayload_pcp.txt +++ /dev/null @@ -1,18 +0,0 @@ -Loading @ErrorInvalidPayload/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /BadPayload_NonExistentFile - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /BadPayload_NonExistentPrim - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidTargetPath.testenv/ErrorInvalidTargetPath/baseline/compositionErrors_ErrorInvalidTargetPath.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidTargetPath.testenv/ErrorInvalidTargetPath/baseline/compositionErrors_ErrorInvalidTargetPath.txt new file mode 100644 index 000000000..e46ac043d --- /dev/null +++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidTargetPath.testenv/ErrorInvalidTargetPath/baseline/compositionErrors_ErrorInvalidTargetPath.txt @@ -0,0 +1,18 @@ +------------------------------------------------------------------------ +Errors while composing + +The attribute connection from in layer @ErrorInvalidTargetPath/A.sdf@ refers to a path outside the scope of the reference from . Ignoring. +The relationship target from in layer @ErrorInvalidTargetPath/A.sdf@ refers to a path outside the scope of the reference from . Ignoring. +The attribute connection from in layer @ErrorInvalidTargetPath/root.sdf@ refers to a path outside the scope of the inherit from . Ignoring. + +------------------------------------------------------------------------ +Errors while composing + +The relationship target from in layer @ErrorInvalidTargetPath/A.sdf@ refers to a path outside the scope of the reference from . Ignoring. + +------------------------------------------------------------------------ +Errors while composing + +The attribute connection from in layer @ErrorInvalidTargetPath/A.sdf@ refers to a path outside the scope of the reference from . Ignoring. +The relationship target from in layer @ErrorInvalidTargetPath/A.sdf@ refers to a path outside the scope of the reference from . Ignoring. + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidTargetPath.testenv/ErrorInvalidTargetPath/baseline/compositionErrors_ErrorInvalidTargetPath_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidTargetPath.testenv/ErrorInvalidTargetPath/baseline/compositionErrors_ErrorInvalidTargetPath_pcp.txt deleted file mode 100644 index e46ac043d..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidTargetPath.testenv/ErrorInvalidTargetPath/baseline/compositionErrors_ErrorInvalidTargetPath_pcp.txt +++ /dev/null @@ -1,18 +0,0 @@ ------------------------------------------------------------------------- -Errors while composing - -The attribute connection from in layer @ErrorInvalidTargetPath/A.sdf@ refers to a path outside the scope of the reference from . Ignoring. -The relationship target from in layer @ErrorInvalidTargetPath/A.sdf@ refers to a path outside the scope of the reference from . Ignoring. -The attribute connection from in layer @ErrorInvalidTargetPath/root.sdf@ refers to a path outside the scope of the inherit from . Ignoring. - ------------------------------------------------------------------------- -Errors while composing - -The relationship target from in layer @ErrorInvalidTargetPath/A.sdf@ refers to a path outside the scope of the reference from . Ignoring. - ------------------------------------------------------------------------- -Errors while composing - -The attribute connection from in layer @ErrorInvalidTargetPath/A.sdf@ refers to a path outside the scope of the reference from . Ignoring. -The relationship target from in layer @ErrorInvalidTargetPath/A.sdf@ refers to a path outside the scope of the reference from . Ignoring. - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidTargetPath.testenv/ErrorInvalidTargetPath/baseline/compositionResults_ErrorInvalidTargetPath.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidTargetPath.testenv/ErrorInvalidTargetPath/baseline/compositionResults_ErrorInvalidTargetPath.txt index b2e6553b0..dcd110278 100644 --- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidTargetPath.testenv/ErrorInvalidTargetPath/baseline/compositionResults_ErrorInvalidTargetPath.txt +++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidTargetPath.testenv/ErrorInvalidTargetPath/baseline/compositionResults_ErrorInvalidTargetPath.txt @@ -25,9 +25,19 @@ Property stacks: /Root.x: root.sdf /Root.x -Attribute connections: -/Root.prohibitedConnectionToInstance: - /Root.x +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /SubrootRef + A.sdf /B/C + +Property names: + ['testRel'] + +Property stacks: +/SubrootRef.testRel: + A.sdf /B/C.testRel ------------------------------------------------------------------------ Results for composing @@ -49,14 +59,6 @@ Property stacks: /RootWithReferenceUnderVariant.B: A.sdf /A.B -Relationship targets: -/RootWithReferenceUnderVariant.B: - /PrimOutsideReferenceRoot - -Attribute connections: -/RootWithReferenceUnderVariant.A: - /PrimOutsideReferenceRoot.A - ------------------------------------------------------------------------ Results for composing diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidTargetPath.testenv/ErrorInvalidTargetPath/baseline/compositionResults_ErrorInvalidTargetPath_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidTargetPath.testenv/ErrorInvalidTargetPath/baseline/compositionResults_ErrorInvalidTargetPath_pcp.txt deleted file mode 100644 index dcd110278..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidTargetPath.testenv/ErrorInvalidTargetPath/baseline/compositionResults_ErrorInvalidTargetPath_pcp.txt +++ /dev/null @@ -1,78 +0,0 @@ -Loading @ErrorInvalidTargetPath/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Root - root.sdf /_Class1 - A.sdf /A - -Property names: - ['A', 'B', 'prohibitedConnectionToInstance', 'x'] - -Property stacks: -/Root.A: - A.sdf /A.A -/Root.B: - A.sdf /A.B -/Root.prohibitedConnectionToInstance: - root.sdf /_Class1.prohibitedConnectionToInstance -/Root.x: - root.sdf /Root.x - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /SubrootRef - A.sdf /B/C - -Property names: - ['testRel'] - -Property stacks: -/SubrootRef.testRel: - A.sdf /B/C.testRel - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /RootWithReferenceUnderVariant - root.sdf /RootWithReferenceUnderVariant{standin=anim} - A.sdf /A - -Variant Selections: - {standin = anim} - -Property names: - ['A', 'B'] - -Property stacks: -/RootWithReferenceUnderVariant.A: - A.sdf /A.A -/RootWithReferenceUnderVariant.B: - A.sdf /A.B - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_Class1 - -Property names: - ['prohibitedConnectionToInstance'] - -Property stacks: -/_Class1.prohibitedConnectionToInstance: - root.sdf /_Class1.prohibitedConnectionToInstance - -Attribute connections: -/_Class1.prohibitedConnectionToInstance: - /Root.x - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorOpinionAtRelocationSource.testenv/baseline/compositionErrors_ErrorOpinionAtRelocationSource.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorOpinionAtRelocationSource.testenv/baseline/compositionErrors_ErrorOpinionAtRelocationSource.txt new file mode 100644 index 000000000..652e55208 --- /dev/null +++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorOpinionAtRelocationSource.testenv/baseline/compositionErrors_ErrorOpinionAtRelocationSource.txt @@ -0,0 +1,5 @@ +------------------------------------------------------------------------ +Errors while composing + +The layer @ErrorOpinionAtRelocationSource/root.sdf@ has an invalid opinion at the relocation source path , which will be ignored. + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorOpinionAtRelocationSource.testenv/baseline/compositionErrors_ErrorOpinionAtRelocationSource_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorOpinionAtRelocationSource.testenv/baseline/compositionErrors_ErrorOpinionAtRelocationSource_pcp.txt deleted file mode 100644 index 652e55208..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorOpinionAtRelocationSource.testenv/baseline/compositionErrors_ErrorOpinionAtRelocationSource_pcp.txt +++ /dev/null @@ -1,5 +0,0 @@ ------------------------------------------------------------------------- -Errors while composing - -The layer @ErrorOpinionAtRelocationSource/root.sdf@ has an invalid opinion at the relocation source path , which will be ignored. - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorOwner.testenv/ErrorOwner/baseline/compositionErrors_ErrorOwner.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorOwner.testenv/ErrorOwner/baseline/compositionErrors_ErrorOwner.txt new file mode 100644 index 000000000..e0dffdcd7 --- /dev/null +++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorOwner.testenv/ErrorOwner/baseline/compositionErrors_ErrorOwner.txt @@ -0,0 +1,5 @@ +------------------------------------------------------------------------ +Errors while computing Layer Stack + +The following sublayers for layer @ErrorOwner/root.sdf@ have the same owner 'foo': @ErrorOwner/stronger.sdf@, @ErrorOwner/owned.sdf@ + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorOwner.testenv/ErrorOwner/baseline/compositionErrors_ErrorOwner_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorOwner.testenv/ErrorOwner/baseline/compositionErrors_ErrorOwner_pcp.txt deleted file mode 100644 index e0dffdcd7..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorOwner.testenv/ErrorOwner/baseline/compositionErrors_ErrorOwner_pcp.txt +++ /dev/null @@ -1,5 +0,0 @@ ------------------------------------------------------------------------- -Errors while computing Layer Stack - -The following sublayers for layer @ErrorOwner/root.sdf@ have the same owner 'foo': @ErrorOwner/stronger.sdf@, @ErrorOwner/owned.sdf@ - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorPermissionDenied.testenv/ErrorPermissionDenied/baseline/compositionErrors_ErrorPermissionDenied.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorPermissionDenied.testenv/ErrorPermissionDenied/baseline/compositionErrors_ErrorPermissionDenied.txt new file mode 100644 index 000000000..92666ef37 --- /dev/null +++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorPermissionDenied.testenv/ErrorPermissionDenied/baseline/compositionErrors_ErrorPermissionDenied.txt @@ -0,0 +1,22 @@ +------------------------------------------------------------------------ +Errors while composing + +The layer at @ErrorPermissionDenied/root.sdf@ has an illegal opinion about an attribute which is private across a reference, inherit, or variant. Ignoring. +The layer at @ErrorPermissionDenied/root.sdf@ has an illegal opinion about a relationship which is private across a reference, inherit, or variant. Ignoring. + +------------------------------------------------------------------------ +Errors while composing + +@ErrorPermissionDenied/root.sdf@ +will be ignored because: +@ErrorPermissionDenied/A.sdf@ +is private and overrides its opinions. + +------------------------------------------------------------------------ +Errors while composing + +@ErrorPermissionDenied/root.sdf@ +CANNOT inherit from: +@ErrorPermissionDenied/root.sdf@ +which is private. + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorPermissionDenied.testenv/ErrorPermissionDenied/baseline/compositionErrors_ErrorPermissionDenied_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorPermissionDenied.testenv/ErrorPermissionDenied/baseline/compositionErrors_ErrorPermissionDenied_pcp.txt deleted file mode 100644 index 92666ef37..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorPermissionDenied.testenv/ErrorPermissionDenied/baseline/compositionErrors_ErrorPermissionDenied_pcp.txt +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------------------------------------------- -Errors while composing - -The layer at @ErrorPermissionDenied/root.sdf@ has an illegal opinion about an attribute which is private across a reference, inherit, or variant. Ignoring. -The layer at @ErrorPermissionDenied/root.sdf@ has an illegal opinion about a relationship which is private across a reference, inherit, or variant. Ignoring. - ------------------------------------------------------------------------- -Errors while composing - -@ErrorPermissionDenied/root.sdf@ -will be ignored because: -@ErrorPermissionDenied/A.sdf@ -is private and overrides its opinions. - ------------------------------------------------------------------------- -Errors while composing - -@ErrorPermissionDenied/root.sdf@ -CANNOT inherit from: -@ErrorPermissionDenied/root.sdf@ -which is private. - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorRelocateToSelf.testenv/baseline/compositionErrors_ErrorRelocateToSelf.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorRelocateToSelf.testenv/baseline/compositionErrors_ErrorRelocateToSelf.txt new file mode 100644 index 000000000..e69de29bb diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorRelocateToSelf.testenv/baseline/compositionErrors_ErrorRelocateToSelf_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorRelocateToSelf.testenv/baseline/compositionErrors_ErrorRelocateToSelf_pcp.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorRelocateToSelf.testenv/baseline/compositionResults_ErrorRelocateToSelf_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorRelocateToSelf.testenv/baseline/compositionResults_ErrorRelocateToSelf_pcp.txt deleted file mode 100644 index 8f5e6c800..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorRelocateToSelf.testenv/baseline/compositionResults_ErrorRelocateToSelf_pcp.txt +++ /dev/null @@ -1,51 +0,0 @@ -Loading @ErrorRelocateToSelf/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Model_1 - model.sdf /Model - -Child names: - ['LocalClass', 'Instance'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Model_1/LocalClass - model.sdf /Model/LocalClass - -Child names: - ['Test'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Model_1/LocalClass/Test - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Model_1/Instance - root.sdf /Model_1/LocalClass - model.sdf /Model/Instance - model.sdf /Model/LocalClass - -Child names: - ['Test'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Model_1/Instance/Test - root.sdf /Model_1/LocalClass/Test - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorSublayerCycle.testenv/ErrorSublayerCycle/baseline/compositionErrors_ErrorSublayerCycle.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorSublayerCycle.testenv/ErrorSublayerCycle/baseline/compositionErrors_ErrorSublayerCycle.txt new file mode 100644 index 000000000..aa98ce038 --- /dev/null +++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorSublayerCycle.testenv/ErrorSublayerCycle/baseline/compositionErrors_ErrorSublayerCycle.txt @@ -0,0 +1,6 @@ +------------------------------------------------------------------------ +Errors while computing Layer Stack + +Sublayer hierarchy with root layer @ErrorSublayerCycle/B.sdf@ has cycles. Detected when layer @ErrorSublayerCycle/A.sdf@ was seen in the layer stack for the second time. +Sublayer hierarchy with root layer @ErrorSublayerCycle/A.sdf@ has cycles. Detected when layer @ErrorSublayerCycle/B.sdf@ was seen in the layer stack for the second time. + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorSublayerCycle.testenv/ErrorSublayerCycle/baseline/compositionErrors_ErrorSublayerCycle_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorSublayerCycle.testenv/ErrorSublayerCycle/baseline/compositionErrors_ErrorSublayerCycle_pcp.txt deleted file mode 100644 index aa98ce038..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorSublayerCycle.testenv/ErrorSublayerCycle/baseline/compositionErrors_ErrorSublayerCycle_pcp.txt +++ /dev/null @@ -1,6 +0,0 @@ ------------------------------------------------------------------------- -Errors while computing Layer Stack - -Sublayer hierarchy with root layer @ErrorSublayerCycle/B.sdf@ has cycles. Detected when layer @ErrorSublayerCycle/A.sdf@ was seen in the layer stack for the second time. -Sublayer hierarchy with root layer @ErrorSublayerCycle/A.sdf@ has cycles. Detected when layer @ErrorSublayerCycle/B.sdf@ was seen in the layer stack for the second time. - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocates.testenv/baseline/compositionErrors_TrickyInheritsAndRelocates.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocates.testenv/baseline/compositionErrors_TrickyInheritsAndRelocates.txt new file mode 100644 index 000000000..e962dfae0 --- /dev/null +++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocates.testenv/baseline/compositionErrors_TrickyInheritsAndRelocates.txt @@ -0,0 +1,26 @@ +------------------------------------------------------------------------ +Errors while composing + +The layer @TrickyInheritsAndRelocates/root.sdf@ has an invalid opinion at the relocation source path , which will be ignored. + +------------------------------------------------------------------------ +Errors while composing + +The layer @TrickyInheritsAndRelocates/root.sdf@ has an invalid opinion at the relocation source path , which will be ignored. + +------------------------------------------------------------------------ +Errors while composing + +The layer @TrickyInheritsAndRelocates/root.sdf@ has an invalid opinion at the relocation source path , which will be ignored. +The layer @TrickyInheritsAndRelocates/root.sdf@ has an invalid opinion at the relocation source path , which will be ignored. + +------------------------------------------------------------------------ +Errors while composing + +The layer @TrickyInheritsAndRelocates/root.sdf@ has an invalid opinion at the relocation source path , which will be ignored. + +------------------------------------------------------------------------ +Errors while composing + +The layer @TrickyInheritsAndRelocates/root.sdf@ has an invalid opinion at the relocation source path , which will be ignored. + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocates.testenv/baseline/compositionErrors_TrickyInheritsAndRelocates_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocates.testenv/baseline/compositionErrors_TrickyInheritsAndRelocates_pcp.txt deleted file mode 100644 index e962dfae0..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocates.testenv/baseline/compositionErrors_TrickyInheritsAndRelocates_pcp.txt +++ /dev/null @@ -1,26 +0,0 @@ ------------------------------------------------------------------------- -Errors while composing - -The layer @TrickyInheritsAndRelocates/root.sdf@ has an invalid opinion at the relocation source path , which will be ignored. - ------------------------------------------------------------------------- -Errors while composing - -The layer @TrickyInheritsAndRelocates/root.sdf@ has an invalid opinion at the relocation source path , which will be ignored. - ------------------------------------------------------------------------- -Errors while composing - -The layer @TrickyInheritsAndRelocates/root.sdf@ has an invalid opinion at the relocation source path , which will be ignored. -The layer @TrickyInheritsAndRelocates/root.sdf@ has an invalid opinion at the relocation source path , which will be ignored. - ------------------------------------------------------------------------- -Errors while composing - -The layer @TrickyInheritsAndRelocates/root.sdf@ has an invalid opinion at the relocation source path , which will be ignored. - ------------------------------------------------------------------------- -Errors while composing - -The layer @TrickyInheritsAndRelocates/root.sdf@ has an invalid opinion at the relocation source path , which will be ignored. - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromPayload.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromPayload.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromPayload.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromPayload.txt new file mode 100644 index 000000000..704b36acd --- /dev/null +++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromPayload.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromPayload.txt @@ -0,0 +1,241 @@ +Loading @TrickyRelocationOfPrimFromPayload/root.sdf@ + +------------------------------------------------------------------------ +Layer Stack: + root.sdf + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PayloadedModel + model_payload.sdf /Model + +Child names: + ['Rig', 'Test'] + +Prohibited child names: + ['Anim'] + +Property names: + ['doc'] + +Property stacks: +/PayloadedModel.doc: + model_payload.sdf /Model.doc + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + model_payload.sdf /Model/Rig + rig.sdf /Rig + +Child names: + ['SymRigBase', 'SymRig', 'LRig'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + rig.sdf /Rig/SymRigBase + +Child names: + ['Anim'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + rig.sdf /Rig/SymRigBase/Anim + +Property names: + ['foo'] + +Property stacks: +/PayloadedModel/Rig/SymRigBase/Anim.foo: + rig.sdf /Rig/SymRigBase/Anim.foo + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + rig.sdf /Rig/SymRig + rig.sdf /Rig/SymRigBase + +Child names: + ['Anim'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + rig.sdf /Rig/SymRigBase/Anim + +Property names: + ['foo'] + +Property stacks: +/PayloadedModel/Rig/SymRig/Anim.foo: + rig.sdf /Rig/SymRigBase/Anim.foo + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + rig.sdf /Rig/LRig + rig.sdf /Rig/SymRig + rig.sdf /Rig/SymRigBase + +Prohibited child names: + ['Anim'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /PayloadedModel/Test + +Child names: + ['Anim'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + model_payload.sdf /Model/Anim + +Child names: + ['LRig'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + rig.sdf /Rig/SymRigBase/Anim + +Property names: + ['foo'] + +Property stacks: +/PayloadedModel/Test/Anim/LRig.foo: + rig.sdf /Rig/SymRigBase/Anim.foo + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /ReferencePayloadedModel + model.sdf /Model + model_payload.sdf /Model + +Child names: + ['Rig', 'Test'] + +Prohibited child names: + ['Anim'] + +Property names: + ['doc'] + +Property stacks: +/ReferencePayloadedModel.doc: + model_payload.sdf /Model.doc + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + model_payload.sdf /Model/Rig + rig.sdf /Rig + +Child names: + ['SymRigBase', 'SymRig', 'LRig'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + rig.sdf /Rig/SymRigBase + +Child names: + ['Anim'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + rig.sdf /Rig/SymRigBase/Anim + +Property names: + ['foo'] + +Property stacks: +/ReferencePayloadedModel/Rig/SymRigBase/Anim.foo: + rig.sdf /Rig/SymRigBase/Anim.foo + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + rig.sdf /Rig/SymRig + rig.sdf /Rig/SymRigBase + +Child names: + ['Anim'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + rig.sdf /Rig/SymRigBase/Anim + +Property names: + ['foo'] + +Property stacks: +/ReferencePayloadedModel/Rig/SymRig/Anim.foo: + rig.sdf /Rig/SymRigBase/Anim.foo + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + rig.sdf /Rig/LRig + rig.sdf /Rig/SymRig + rig.sdf /Rig/SymRigBase + +Prohibited child names: + ['Anim'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + model.sdf /Model/Test + +Child names: + ['Anim'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + model_payload.sdf /Model/Anim + +Child names: + ['LRig'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + rig.sdf /Rig/SymRigBase/Anim + +Property names: + ['foo'] + +Property stacks: +/ReferencePayloadedModel/Test/Anim/LRig.foo: + rig.sdf /Rig/SymRigBase/Anim.foo + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromPayload.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromPayload_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromPayload.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromPayload_pcp.txt deleted file mode 100644 index 704b36acd..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromPayload.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromPayload_pcp.txt +++ /dev/null @@ -1,241 +0,0 @@ -Loading @TrickyRelocationOfPrimFromPayload/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PayloadedModel - model_payload.sdf /Model - -Child names: - ['Rig', 'Test'] - -Prohibited child names: - ['Anim'] - -Property names: - ['doc'] - -Property stacks: -/PayloadedModel.doc: - model_payload.sdf /Model.doc - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - model_payload.sdf /Model/Rig - rig.sdf /Rig - -Child names: - ['SymRigBase', 'SymRig', 'LRig'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - rig.sdf /Rig/SymRigBase - -Child names: - ['Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - rig.sdf /Rig/SymRigBase/Anim - -Property names: - ['foo'] - -Property stacks: -/PayloadedModel/Rig/SymRigBase/Anim.foo: - rig.sdf /Rig/SymRigBase/Anim.foo - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - rig.sdf /Rig/SymRig - rig.sdf /Rig/SymRigBase - -Child names: - ['Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - rig.sdf /Rig/SymRigBase/Anim - -Property names: - ['foo'] - -Property stacks: -/PayloadedModel/Rig/SymRig/Anim.foo: - rig.sdf /Rig/SymRigBase/Anim.foo - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - rig.sdf /Rig/LRig - rig.sdf /Rig/SymRig - rig.sdf /Rig/SymRigBase - -Prohibited child names: - ['Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /PayloadedModel/Test - -Child names: - ['Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - model_payload.sdf /Model/Anim - -Child names: - ['LRig'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - rig.sdf /Rig/SymRigBase/Anim - -Property names: - ['foo'] - -Property stacks: -/PayloadedModel/Test/Anim/LRig.foo: - rig.sdf /Rig/SymRigBase/Anim.foo - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /ReferencePayloadedModel - model.sdf /Model - model_payload.sdf /Model - -Child names: - ['Rig', 'Test'] - -Prohibited child names: - ['Anim'] - -Property names: - ['doc'] - -Property stacks: -/ReferencePayloadedModel.doc: - model_payload.sdf /Model.doc - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - model_payload.sdf /Model/Rig - rig.sdf /Rig - -Child names: - ['SymRigBase', 'SymRig', 'LRig'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - rig.sdf /Rig/SymRigBase - -Child names: - ['Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - rig.sdf /Rig/SymRigBase/Anim - -Property names: - ['foo'] - -Property stacks: -/ReferencePayloadedModel/Rig/SymRigBase/Anim.foo: - rig.sdf /Rig/SymRigBase/Anim.foo - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - rig.sdf /Rig/SymRig - rig.sdf /Rig/SymRigBase - -Child names: - ['Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - rig.sdf /Rig/SymRigBase/Anim - -Property names: - ['foo'] - -Property stacks: -/ReferencePayloadedModel/Rig/SymRig/Anim.foo: - rig.sdf /Rig/SymRigBase/Anim.foo - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - rig.sdf /Rig/LRig - rig.sdf /Rig/SymRig - rig.sdf /Rig/SymRigBase - -Prohibited child names: - ['Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - model.sdf /Model/Test - -Child names: - ['Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - model_payload.sdf /Model/Anim - -Child names: - ['LRig'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - rig.sdf /Rig/SymRigBase/Anim - -Property names: - ['foo'] - -Property stacks: -/ReferencePayloadedModel/Test/Anim/LRig.foo: - rig.sdf /Rig/SymRigBase/Anim.foo - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromVariant.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromVariant.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromVariant.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromVariant.txt index ad6621dd8..e7e4a2d48 100644 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromVariant.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromVariant.txt +++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromVariant.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromVariant.txt @@ -25,6 +25,9 @@ Prim Stack: CharRig.sdf /CharRig{TailRigVersion=Standard}TailRig TailRig.sdf /TailRig +Prohibited child names: + ['Tail'] + ------------------------------------------------------------------------ Results for composing @@ -60,3 +63,6 @@ Results for composing Prim Stack: CharRig.sdf /CharRig2/Anim +Child names: + ['Tail'] + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromVariant.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromVariant_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromVariant.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromVariant_pcp.txt deleted file mode 100644 index e7e4a2d48..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromVariant.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromVariant_pcp.txt +++ /dev/null @@ -1,68 +0,0 @@ -Loading @TrickyRelocationOfPrimFromVariant/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Char - CharRig.sdf /CharRig - CharRig.sdf /CharRig{TailRigVersion=Standard} - -Variant Selections: - {TailRigVersion = Standard} - -Child names: - ['TailRig', 'Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - CharRig.sdf /CharRig{TailRigVersion=Standard}TailRig - TailRig.sdf /TailRig - -Prohibited child names: - ['Tail'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - CharRig.sdf /CharRig/Anim - -Child names: - ['Tail'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - TailRig.sdf /TailRig/Tail - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Char2 - CharRig.sdf /CharRig2 - CharRig.sdf /CharRig2{TailRigVersion=None} - -Variant Selections: - {TailRigVersion = None} - -Child names: - ['Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - CharRig.sdf /CharRig2/Anim - -Child names: - ['Tail'] - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyInherits.testenv/baseline/compositionResults_TrickySpookyInherits.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyInherits.testenv/baseline/compositionResults_TrickySpookyInherits.txt index 4dc7da669..966759933 100644 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyInherits.testenv/baseline/compositionResults_TrickySpookyInherits.txt +++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyInherits.testenv/baseline/compositionResults_TrickySpookyInherits.txt @@ -28,6 +28,9 @@ Prim Stack: Child names: ['SymRig'] +Prohibited child names: + ['LRig'] + ------------------------------------------------------------------------ Results for composing @@ -51,7 +54,10 @@ Child names: Results for composing Prim Stack: + root.sdf /_class_Model/Rig/SymRig + root.sdf /_class_Model/Rig/LRig root.sdf /_class_Model/Anim/LAnim + model.sdf /_class_Model/Rig/SymRig model.sdf /_class_Model/Rig/LRig rig.sdf /Rig/LRig rig.sdf /Rig/SymRig diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyInherits.testenv/baseline/compositionResults_TrickySpookyInherits_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyInherits.testenv/baseline/compositionResults_TrickySpookyInherits_pcp.txt deleted file mode 100644 index 966759933..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyInherits.testenv/baseline/compositionResults_TrickySpookyInherits_pcp.txt +++ /dev/null @@ -1,109 +0,0 @@ -Loading @TrickySpookyInherits/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Model_1 - root.sdf /_class_Model - model.sdf /Model - model.sdf /_class_Model - -Child names: - ['Rig', 'Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_Model/Rig - model.sdf /Model/Rig - model.sdf /_class_Model/Rig - rig.sdf /Rig - -Child names: - ['SymRig'] - -Prohibited child names: - ['LRig'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_Model/Rig/SymRig - model.sdf /_class_Model/Rig/SymRig - rig.sdf /Rig/SymRig - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_Model/Anim - model.sdf /Model/Anim - model.sdf /_class_Model/Anim - -Child names: - ['LAnim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_Model/Rig/SymRig - root.sdf /_class_Model/Rig/LRig - root.sdf /_class_Model/Anim/LAnim - model.sdf /_class_Model/Rig/SymRig - model.sdf /_class_Model/Rig/LRig - rig.sdf /Rig/LRig - rig.sdf /Rig/SymRig - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_Model - -Child names: - ['Rig', 'Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_Model/Rig - -Child names: - ['SymRig', 'LRig'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_Model/Rig/SymRig - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_Model/Rig/LRig - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_Model/Anim - -Child names: - ['LAnim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_Model/Anim/LAnim - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyVariantSelection.testenv/baseline/compositionResults_TrickySpookyVariantSelection.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyVariantSelection.testenv/baseline/compositionResults_TrickySpookyVariantSelection.txt index d6dde3a50..b1d5f2a5a 100644 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyVariantSelection.testenv/baseline/compositionResults_TrickySpookyVariantSelection.txt +++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyVariantSelection.testenv/baseline/compositionResults_TrickySpookyVariantSelection.txt @@ -31,14 +31,17 @@ Prim Stack: root.sdf /CharRig/Anim/Lip FaceRig.sdf /FaceRig/Anim/Lip LipRig.sdf /LipRig/Anim + TwoLips.sdf /LipsRig/Anim SingleLip.sdf /LipsRig/Anim Property names: - ['Lip1'] + ['Lip1', 'Lip2'] Property stacks: /CharRig/Anim/Lip.Lip1: SingleLip.sdf /LipsRig/Anim.Lip1 +/CharRig/Anim/Lip.Lip2: + TwoLips.sdf /LipsRig/Anim.Lip2 ------------------------------------------------------------------------ Results for composing @@ -67,6 +70,9 @@ Variant Selections: Child names: ['Rig'] +Prohibited child names: + ['Anim'] + ------------------------------------------------------------------------ Results for composing diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyVariantSelection.testenv/baseline/compositionResults_TrickySpookyVariantSelection_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyVariantSelection.testenv/baseline/compositionResults_TrickySpookyVariantSelection_pcp.txt deleted file mode 100644 index b1d5f2a5a..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyVariantSelection.testenv/baseline/compositionResults_TrickySpookyVariantSelection_pcp.txt +++ /dev/null @@ -1,119 +0,0 @@ -Loading @TrickySpookyVariantSelection/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /CharRig - FaceRig.sdf /FaceRig - -Child names: - ['Anim', 'Rig'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /CharRig/Anim - FaceRig.sdf /FaceRig/Anim - -Child names: - ['Lip'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /CharRig/Anim/Lip - FaceRig.sdf /FaceRig/Anim/Lip - LipRig.sdf /LipRig/Anim - TwoLips.sdf /LipsRig/Anim - SingleLip.sdf /LipsRig/Anim - -Property names: - ['Lip1', 'Lip2'] - -Property stacks: -/CharRig/Anim/Lip.Lip1: - SingleLip.sdf /LipsRig/Anim.Lip1 -/CharRig/Anim/Lip.Lip2: - TwoLips.sdf /LipsRig/Anim.Lip2 - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /CharRig/Rig - FaceRig.sdf /FaceRig/Rig - -Child names: - ['LipRig'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /CharRig/Rig/LipRig - FaceRig.sdf /FaceRig/Rig/LipRig - LipRig.sdf /LipRig - LipRig.sdf /LipRig{LipRigStyle=TwoLips} - TwoLips.sdf /LipsRig - SingleLip.sdf /LipsRig - -Variant Selections: - {LipRigStyle = TwoLips} - -Child names: - ['Rig'] - -Prohibited child names: - ['Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - TwoLips.sdf /LipsRig/Rig - SingleLip.sdf /LipsRig/Rig - -Child names: - ['Lip1Sculpt', 'Lip2Sculpt'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - SingleLip.sdf /LipsRig/Rig/Lip1Sculpt - -Property names: - ['amount'] - -Property stacks: -/CharRig/Rig/LipRig/Rig/Lip1Sculpt.amount: - SingleLip.sdf /LipsRig/Rig/Lip1Sculpt.amount - -Attribute connections: -/CharRig/Rig/LipRig/Rig/Lip1Sculpt.amount: - /CharRig/Anim/Lip.Lip1 - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - TwoLips.sdf /LipsRig/Rig/Lip2Sculpt - -Property names: - ['amount'] - -Property stacks: -/CharRig/Rig/LipRig/Rig/Lip2Sculpt.amount: - TwoLips.sdf /LipsRig/Rig/Lip2Sculpt.amount - -Attribute connections: -/CharRig/Rig/LipRig/Rig/Lip2Sculpt.amount: - /CharRig/Anim/Lip.Lip2 - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyVariantSelectionInClass.testenv/baseline/compositionResults_TrickySpookyVariantSelectionInClass.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyVariantSelectionInClass.testenv/baseline/compositionResults_TrickySpookyVariantSelectionInClass.txt index 0e7a41b6d..e291f12b1 100644 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyVariantSelectionInClass.testenv/baseline/compositionResults_TrickySpookyVariantSelectionInClass.txt +++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyVariantSelectionInClass.testenv/baseline/compositionResults_TrickySpookyVariantSelectionInClass.txt @@ -20,6 +20,35 @@ Results for composing Prim Stack: CharRig.sdf /CharRig/Anim +Child names: + ['LeftLeg', 'RightLeg'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + LegRig.sdf /LegRig{LegRigStyle=1Leg}Anim + +Property names: + ['avarFor1LegStyle'] + +Property stacks: +/Char/Anim/LeftLeg.avarFor1LegStyle: + LegRig.sdf /LegRig{LegRigStyle=1Leg}Anim.avarFor1LegStyle + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + LegRig.sdf /LegRig{LegRigStyle=2Leg}Anim + +Property names: + ['avarFor2LegStyle'] + +Property stacks: +/Char/Anim/RightLeg.avarFor2LegStyle: + LegRig.sdf /LegRig{LegRigStyle=2Leg}Anim.avarFor2LegStyle + ------------------------------------------------------------------------ Results for composing @@ -72,6 +101,9 @@ Prim Stack: Variant Selections: {LegRigStyle = 1Leg} +Prohibited child names: + ['Anim'] + ------------------------------------------------------------------------ Results for composing @@ -86,6 +118,9 @@ Prim Stack: Variant Selections: {LegRigStyle = 2Leg} +Prohibited child names: + ['Anim'] + ------------------------------------------------------------------------ Results for composing diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyVariantSelectionInClass.testenv/baseline/compositionResults_TrickySpookyVariantSelectionInClass_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyVariantSelectionInClass.testenv/baseline/compositionResults_TrickySpookyVariantSelectionInClass_pcp.txt deleted file mode 100644 index e291f12b1..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickySpookyVariantSelectionInClass.testenv/baseline/compositionResults_TrickySpookyVariantSelectionInClass_pcp.txt +++ /dev/null @@ -1,178 +0,0 @@ -Loading @TrickySpookyVariantSelectionInClass/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Char - CharRig.sdf /CharRig - -Child names: - ['Anim', 'Rig', 'InheritTest'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - CharRig.sdf /CharRig/Anim - -Child names: - ['LeftLeg', 'RightLeg'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - LegRig.sdf /LegRig{LegRigStyle=1Leg}Anim - -Property names: - ['avarFor1LegStyle'] - -Property stacks: -/Char/Anim/LeftLeg.avarFor1LegStyle: - LegRig.sdf /LegRig{LegRigStyle=1Leg}Anim.avarFor1LegStyle - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - LegRig.sdf /LegRig{LegRigStyle=2Leg}Anim - -Property names: - ['avarFor2LegStyle'] - -Property stacks: -/Char/Anim/RightLeg.avarFor2LegStyle: - LegRig.sdf /LegRig{LegRigStyle=2Leg}Anim.avarFor2LegStyle - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Char/Rig - CharRig.sdf /CharRig/Rig - -Child names: - ['SymLegRig', 'LeftLegRig', 'RightLegRig'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Char/Rig/SymLegRig - CharRig.sdf /CharRig/Rig/SymLegRig - LegRig.sdf /LegRig - LegRig.sdf /LegRig{LegRigStyle=1Leg} - -Variant Selections: - {LegRigStyle = 1Leg} - -Child names: - ['Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - LegRig.sdf /LegRig{LegRigStyle=1Leg}Anim - -Property names: - ['avarFor1LegStyle'] - -Property stacks: -/Char/Rig/SymLegRig/Anim.avarFor1LegStyle: - LegRig.sdf /LegRig{LegRigStyle=1Leg}Anim.avarFor1LegStyle - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Char/Rig/LeftLegRig - root.sdf /Char/Rig/SymLegRig - CharRig.sdf /CharRig/Rig/LeftLegRig - CharRig.sdf /CharRig/Rig/SymLegRig - LegRig.sdf /LegRig - LegRig.sdf /LegRig{LegRigStyle=1Leg} - -Variant Selections: - {LegRigStyle = 1Leg} - -Prohibited child names: - ['Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Char/Rig/RightLegRig - root.sdf /Char/Rig/SymLegRig - CharRig.sdf /CharRig/Rig/RightLegRig - CharRig.sdf /CharRig/Rig/SymLegRig - LegRig.sdf /LegRig - LegRig.sdf /LegRig{LegRigStyle=2Leg} - -Variant Selections: - {LegRigStyle = 2Leg} - -Prohibited child names: - ['Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Char/InheritTest - CharRig.sdf /CharRig/InheritTest - -Child names: - ['_class_X', 'X', 'Y'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Char/InheritTest/_class_X - CharRig.sdf /CharRig/InheritTest/_class_X - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Char/InheritTest/X - root.sdf /Char/InheritTest/_class_X - CharRig.sdf /CharRig/InheritTest/X - CharRig.sdf /CharRig/InheritTest/_class_X - LegRig.sdf /LegRig - LegRig.sdf /LegRig{LegRigStyle=2Leg} - -Variant Selections: - {LegRigStyle = 2Leg} - -Child names: - ['Anim'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - CharRig.sdf /CharRig/InheritTest/X/Anim - LegRig.sdf /LegRig{LegRigStyle=2Leg}Anim - -Property names: - ['avarFor2LegStyle'] - -Property stacks: -/Char/InheritTest/X/Anim.avarFor2LegStyle: - LegRig.sdf /LegRig{LegRigStyle=2Leg}Anim.avarFor2LegStyle - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - CharRig.sdf /CharRig/InheritTest/Y - CharRig.sdf /CharRig/InheritTest/X/Anim - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantAncestralSelection.testenv/baseline/compositionResults_TrickyVariantAncestralSelection.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantAncestralSelection.testenv/baseline/compositionResults_TrickyVariantAncestralSelection.txt index 08b1d4868..0e9a46298 100644 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantAncestralSelection.testenv/baseline/compositionResults_TrickyVariantAncestralSelection.txt +++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantAncestralSelection.testenv/baseline/compositionResults_TrickyVariantAncestralSelection.txt @@ -60,13 +60,13 @@ Prim Stack: root.sdf /_class_A1/B/C ref.sdf /A1/B/C ref2.sdf /C - ref2.sdf /C{v1=B} + ref2.sdf /C{v1=C} ref2.sdf /C{v2=Z} ref2.sdf /B/C - ref2.sdf /B/C{v1=B} + ref2.sdf /B/C{v1=C} ref2.sdf /B/C{v2=Z} ref2.sdf /A/B/C - ref2.sdf /A/B/C{v1=A} + ref2.sdf /A/B/C{v1=C} ref2.sdf /A/B/C{v2=Z} Variant Selections: @@ -74,7 +74,7 @@ Variant Selections: {v2 = Z} Child names: - ['v2_Z', 'v1_B'] + ['v2_Z', 'v1_C'] ------------------------------------------------------------------------ Results for composing @@ -83,8 +83,8 @@ Prim Stack: ref2.sdf /C{v2=Z}v2_Z ------------------------------------------------------------------------ -Results for composing +Results for composing Prim Stack: - ref2.sdf /C{v1=B}v1_B + ref2.sdf /C{v1=C}v1_C diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantAncestralSelection.testenv/baseline/compositionResults_TrickyVariantAncestralSelection_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantAncestralSelection.testenv/baseline/compositionResults_TrickyVariantAncestralSelection_pcp.txt deleted file mode 100644 index 0e9a46298..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantAncestralSelection.testenv/baseline/compositionResults_TrickyVariantAncestralSelection_pcp.txt +++ /dev/null @@ -1,90 +0,0 @@ -Loading @TrickyVariantAncestralSelection/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_A1 - -Child names: - ['B'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_A1/B - -Child names: - ['C'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_A1/B/C - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Root - root.sdf /_class_A1 - ref.sdf /A1 - ref.sdf /_class_A1 - ref2.sdf /A - -Child names: - ['B'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_A1/B - ref.sdf /A1/B - ref2.sdf /B - ref2.sdf /A/B - -Child names: - ['C'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_A1/B/C - ref.sdf /A1/B/C - ref2.sdf /C - ref2.sdf /C{v1=C} - ref2.sdf /C{v2=Z} - ref2.sdf /B/C - ref2.sdf /B/C{v1=C} - ref2.sdf /B/C{v2=Z} - ref2.sdf /A/B/C - ref2.sdf /A/B/C{v1=C} - ref2.sdf /A/B/C{v2=Z} - -Variant Selections: - {v1 = C} - {v2 = Z} - -Child names: - ['v2_Z', 'v1_C'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - ref2.sdf /C{v2=Z}v2_Z - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - ref2.sdf /C{v1=C}v1_C - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantIndependentSelection.testenv/baseline/compositionResults_TrickyVariantIndependentSelection.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantIndependentSelection.testenv/baseline/compositionResults_TrickyVariantIndependentSelection.txt index 055575e0a..609f1cc17 100644 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantIndependentSelection.testenv/baseline/compositionResults_TrickyVariantIndependentSelection.txt +++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantIndependentSelection.testenv/baseline/compositionResults_TrickyVariantIndependentSelection.txt @@ -21,10 +21,10 @@ Prim Stack: ref.sdf /Model_1{transformVariant=a} ref.sdf /Model_1{pin=test} ref.sdf /Model_2 - ref.sdf /Model_2{transformVariant=b} + ref.sdf /Model_2{transformVariant=a} ref.sdf /Model_2{pin=test} ref.sdf /Model_3 - ref.sdf /Model_3{transformVariant=c} + ref.sdf /Model_3{transformVariant=a} ref.sdf /Model_3{pin=test} Variant Selections: @@ -32,7 +32,7 @@ Variant Selections: {transformVariant = a} Child names: - ['Model_3_Pin_Test', 'Model_3_Transform_C', 'Model_2_Pin_Test', 'Model_2_Transform_B', 'Model_1_Pin_Test', 'Model_1_Transform_A'] + ['Model_3_Pin_Test', 'Model_3_Transform_A', 'Model_2_Pin_Test', 'Model_2_Transform_A', 'Model_1_Pin_Test', 'Model_1_Transform_A'] ------------------------------------------------------------------------ Results for composing @@ -41,10 +41,10 @@ Prim Stack: ref.sdf /Model_3{pin=test}Model_3_Pin_Test ------------------------------------------------------------------------ -Results for composing +Results for composing Prim Stack: - ref.sdf /Model_3{transformVariant=c}Model_3_Transform_C + ref.sdf /Model_3{transformVariant=a}Model_3_Transform_A ------------------------------------------------------------------------ Results for composing @@ -53,10 +53,10 @@ Prim Stack: ref.sdf /Model_2{pin=test}Model_2_Pin_Test ------------------------------------------------------------------------ -Results for composing +Results for composing Prim Stack: - ref.sdf /Model_2{transformVariant=b}Model_2_Transform_B + ref.sdf /Model_2{transformVariant=a}Model_2_Transform_A ------------------------------------------------------------------------ Results for composing diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantIndependentSelection.testenv/baseline/compositionResults_TrickyVariantIndependentSelection_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantIndependentSelection.testenv/baseline/compositionResults_TrickyVariantIndependentSelection_pcp.txt deleted file mode 100644 index 609f1cc17..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantIndependentSelection.testenv/baseline/compositionResults_TrickyVariantIndependentSelection_pcp.txt +++ /dev/null @@ -1,72 +0,0 @@ -Loading @TrickyVariantIndependentSelection/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /_class_Model - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Model - root.sdf /_class_Model - model.sdf /Model - ref.sdf /Model_1 - ref.sdf /Model_1{transformVariant=a} - ref.sdf /Model_1{pin=test} - ref.sdf /Model_2 - ref.sdf /Model_2{transformVariant=a} - ref.sdf /Model_2{pin=test} - ref.sdf /Model_3 - ref.sdf /Model_3{transformVariant=a} - ref.sdf /Model_3{pin=test} - -Variant Selections: - {pin = test} - {transformVariant = a} - -Child names: - ['Model_3_Pin_Test', 'Model_3_Transform_A', 'Model_2_Pin_Test', 'Model_2_Transform_A', 'Model_1_Pin_Test', 'Model_1_Transform_A'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - ref.sdf /Model_3{pin=test}Model_3_Pin_Test - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - ref.sdf /Model_3{transformVariant=a}Model_3_Transform_A - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - ref.sdf /Model_2{pin=test}Model_2_Pin_Test - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - ref.sdf /Model_2{transformVariant=a}Model_2_Transform_A - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - ref.sdf /Model_1{pin=test}Model_1_Pin_Test - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - ref.sdf /Model_1{transformVariant=a}Model_1_Transform_A - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantSelectionInVariant.testenv/baseline/compositionResults_TrickyVariantSelectionInVariant.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantSelectionInVariant.testenv/baseline/compositionResults_TrickyVariantSelectionInVariant.txt new file mode 100644 index 000000000..408f0c9ba --- /dev/null +++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantSelectionInVariant.testenv/baseline/compositionResults_TrickyVariantSelectionInVariant.txt @@ -0,0 +1,50 @@ +Loading @TrickyVariantSelectionInVariant/root.sdf@ + +------------------------------------------------------------------------ +Layer Stack: + root.sdf + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /SlugJ + SlugJ_payload.sdf /SlugJ + SlugJ_modelInterface.gen.sdf /SlugJ + SlugJ_modelInterface.gen.sdf /SlugJ{shaderBindingVariant=Wet} + SlugJ_modelInterface.gen.sdf /SlugJ{shadingVariant=Axel} + SlugJ_shaderDisplayDefs.sdf /SlugJ + SlugJ_shaderDisplayDefs.sdf /ShaderBindingVariants + SlugJ_shaderDisplayDefs.sdf /ShaderBindingVariants{shaderBindingVariant=Wet} + +Variant Selections: + {shaderBindingVariant = Wet} + {shadingVariant = Axel} + +Child names: + ['Shaders'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + SlugJ_shaderDisplayDefs.sdf /SlugJ/Shaders + SlugJ_shaderDisplayDefs.sdf /ShaderBindingVariants{shaderBindingVariant=Wet}Shaders + +Child names: + ['BGVariant_Surface'] + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + SlugJ_shaderDisplayDefs.sdf /SlugJ/Shaders/BGVariant_Surface + SlugJ_shaderDisplayDefs.sdf /ShaderBindingVariants{shaderBindingVariant=Wet}Shaders/BGVariant_Surface + +Property names: + ['activeBinding'] + +Property stacks: +/SlugJ/Shaders/BGVariant_Surface.activeBinding: + SlugJ_shaderDisplayDefs.sdf /ShaderBindingVariants{shaderBindingVariant=Wet}Shaders/BGVariant_Surface.activeBinding + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantSelectionInVariant.testenv/baseline/compositionResults_TrickyVariantSelectionInVariant_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantSelectionInVariant.testenv/baseline/compositionResults_TrickyVariantSelectionInVariant_pcp.txt deleted file mode 100644 index 408f0c9ba..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantSelectionInVariant.testenv/baseline/compositionResults_TrickyVariantSelectionInVariant_pcp.txt +++ /dev/null @@ -1,50 +0,0 @@ -Loading @TrickyVariantSelectionInVariant/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /SlugJ - SlugJ_payload.sdf /SlugJ - SlugJ_modelInterface.gen.sdf /SlugJ - SlugJ_modelInterface.gen.sdf /SlugJ{shaderBindingVariant=Wet} - SlugJ_modelInterface.gen.sdf /SlugJ{shadingVariant=Axel} - SlugJ_shaderDisplayDefs.sdf /SlugJ - SlugJ_shaderDisplayDefs.sdf /ShaderBindingVariants - SlugJ_shaderDisplayDefs.sdf /ShaderBindingVariants{shaderBindingVariant=Wet} - -Variant Selections: - {shaderBindingVariant = Wet} - {shadingVariant = Axel} - -Child names: - ['Shaders'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - SlugJ_shaderDisplayDefs.sdf /SlugJ/Shaders - SlugJ_shaderDisplayDefs.sdf /ShaderBindingVariants{shaderBindingVariant=Wet}Shaders - -Child names: - ['BGVariant_Surface'] - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - SlugJ_shaderDisplayDefs.sdf /SlugJ/Shaders/BGVariant_Surface - SlugJ_shaderDisplayDefs.sdf /ShaderBindingVariants{shaderBindingVariant=Wet}Shaders/BGVariant_Surface - -Property names: - ['activeBinding'] - -Property stacks: -/SlugJ/Shaders/BGVariant_Surface.activeBinding: - SlugJ_shaderDisplayDefs.sdf /ShaderBindingVariants{shaderBindingVariant=Wet}Shaders/BGVariant_Surface.activeBinding - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantWeakerSelection.testenv/baseline/compositionResults_TrickyVariantWeakerSelection.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantWeakerSelection.testenv/baseline/compositionResults_TrickyVariantWeakerSelection.txt index 053870b10..a657c954c 100644 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantWeakerSelection.testenv/baseline/compositionResults_TrickyVariantWeakerSelection.txt +++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantWeakerSelection.testenv/baseline/compositionResults_TrickyVariantWeakerSelection.txt @@ -9,8 +9,18 @@ Results for composing Prim Stack: root.sdf /A + root.sdf /A{v=v2} model.sdf /A + model.sdf /A{v=v2} Variant Selections: {v = v2} +Property names: + ['v2'] + +Property stacks: +/A.v2: + root.sdf /A{v=v2}.v2 + model.sdf /A{v=v2}.v2 + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantWeakerSelection.testenv/baseline/compositionResults_TrickyVariantWeakerSelection_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantWeakerSelection.testenv/baseline/compositionResults_TrickyVariantWeakerSelection_pcp.txt deleted file mode 100644 index a657c954c..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyVariantWeakerSelection.testenv/baseline/compositionResults_TrickyVariantWeakerSelection_pcp.txt +++ /dev/null @@ -1,26 +0,0 @@ -Loading @TrickyVariantWeakerSelection/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /A - root.sdf /A{v=v2} - model.sdf /A - model.sdf /A{v=v2} - -Variant Selections: - {v = v2} - -Property names: - ['v2'] - -Property stacks: -/A.v2: - root.sdf /A{v=v2}.v2 - model.sdf /A{v=v2}.v2 - diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TypicalReferenceToChargroup.testenv/baseline/compositionResults_TypicalReferenceToChargroup.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TypicalReferenceToChargroup.testenv/baseline/compositionResults_TypicalReferenceToChargroup.txt new file mode 100644 index 000000000..ad0544607 --- /dev/null +++ b/pxr/usd/pcp/testenv/testPcpMuseum_TypicalReferenceToChargroup.testenv/baseline/compositionResults_TypicalReferenceToChargroup.txt @@ -0,0 +1,47 @@ +Loading @TypicalReferenceToChargroup/root.sdf@ + +------------------------------------------------------------------------ +Layer Stack: + root.sdf + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /Group + group.sdf /Group + group.sdf /Group{standin=sim} + +Variant Selections: + {standin = sim} + +Child names: + ['Model'] + +Property names: + ['standin_name'] + +Property stacks: +/Group.standin_name: + group.sdf /Group{standin=sim}.standin_name + +------------------------------------------------------------------------ +Results for composing + +Prim Stack: + root.sdf /Group/Model + group.sdf /Group/Model + group.sdf /Group{standin=sim}Model + model.sdf /Model + model.sdf /Model{standin=sim} + +Variant Selections: + {standin = sim} + +Property names: + ['standin_name'] + +Property stacks: +/Group/Model.standin_name: + model.sdf /Model{standin=sim}.standin_name + diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TypicalReferenceToChargroup.testenv/baseline/compositionResults_TypicalReferenceToChargroup_pcp.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TypicalReferenceToChargroup.testenv/baseline/compositionResults_TypicalReferenceToChargroup_pcp.txt deleted file mode 100644 index ad0544607..000000000 --- a/pxr/usd/pcp/testenv/testPcpMuseum_TypicalReferenceToChargroup.testenv/baseline/compositionResults_TypicalReferenceToChargroup_pcp.txt +++ /dev/null @@ -1,47 +0,0 @@ -Loading @TypicalReferenceToChargroup/root.sdf@ - ------------------------------------------------------------------------- -Layer Stack: - root.sdf - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Group - group.sdf /Group - group.sdf /Group{standin=sim} - -Variant Selections: - {standin = sim} - -Child names: - ['Model'] - -Property names: - ['standin_name'] - -Property stacks: -/Group.standin_name: - group.sdf /Group{standin=sim}.standin_name - ------------------------------------------------------------------------- -Results for composing - -Prim Stack: - root.sdf /Group/Model - group.sdf /Group/Model - group.sdf /Group{standin=sim}Model - model.sdf /Model - model.sdf /Model{standin=sim} - -Variant Selections: - {standin = sim} - -Property names: - ['standin_name'] - -Property stacks: -/Group/Model.standin_name: - model.sdf /Model{standin=sim}.standin_name -