From c2cc3a9673c59cb877a5212763bc3db4e6a96c99 Mon Sep 17 00:00:00 2001 From: Swung0x48 Date: Tue, 22 Sep 2026 17:37:59 -0400 Subject: [PATCH] [MG_Test] (P7): the subsystem-deps server-gate cases compile in the pull build too D2's SubsystemDepsTest called the four Resolve*SubsystemArm resolvers, which Managers.h declares only under MOBILEGL_PIPE_PUSH (:664), so build-linux (the pull flavour, ID-P7-11) stopped compiling while the stale libMobileGL.so kept G1 looking green. Cases 3 and 4 now skip in the pull flavour the way case 2 already did; the unit name set is the same in both flavours. Pull build rc 0, .text 0xa52203, symbols 0 added / 0 removed; push flavour 5/5. --- .../MG_Test/Backend/DirectGLES/SubsystemDepsTest.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MobileGL/MG_Test/Backend/DirectGLES/SubsystemDepsTest.cpp b/MobileGL/MG_Test/Backend/DirectGLES/SubsystemDepsTest.cpp index 923f7919..c9efb952 100644 --- a/MobileGL/MG_Test/Backend/DirectGLES/SubsystemDepsTest.cpp +++ b/MobileGL/MG_Test/Backend/DirectGLES/SubsystemDepsTest.cpp @@ -189,6 +189,7 @@ TEST(SubsystemDepsTest, TheClientNeverEmitsAFamilyTheTableRefuses) { // disagreement is a half-run subsystem rather than an extra refusal. // --------------------------------------------------------------------------------------------- TEST(SubsystemDepsTest, TheServerConsumerGateNeverArmsAFamilyTheTableRefuses) { +#if MOBILEGL_PIPE_PUSH using namespace MobileGL::MG_Backend::DirectGLES; struct Resolver { const char* Name; @@ -219,6 +220,12 @@ TEST(SubsystemDepsTest, TheServerConsumerGateNeverArmsAFamilyTheTableRefuses) { << resolver.Name << " armed with its own bit clear at " << Describe(mask); } } +#else + // The resolvers are declared under MOBILEGL_PIPE_PUSH (Managers.h:664); the pull build has + // no consumer gate to compare against the table. Skipped, not omitted, so the unit name set + // stays the same in both flavours (ID-P7-11). + GTEST_SKIP() << "the server consumer gate is compiled only under MOBILEGL_PIPE_PUSH"; +#endif } // --------------------------------------------------------------------------------------------- @@ -226,6 +233,7 @@ TEST(SubsystemDepsTest, TheServerConsumerGateNeverArmsAFamilyTheTableRefuses) { // vacuously green because every resolver said NO for an unrelated reason. // --------------------------------------------------------------------------------------------- TEST(SubsystemDepsTest, TheTwoDocumentedRefusalLanesStillRefuseAndTheFullMaskStillArms) { +#if MOBILEGL_PIPE_PUSH using namespace MobileGL::MG_Backend::DirectGLES; { PushMaskScope scope(kMGPipeSubsystemsMigratedAtP5e); @@ -244,4 +252,7 @@ TEST(SubsystemDepsTest, TheTwoDocumentedRefusalLanesStillRefuseAndTheFullMaskSti "D-K2's fourth row has been dropped on the server side while the client and the " ".def still carry it"; } +#else + GTEST_SKIP() << "the server consumer gate is compiled only under MOBILEGL_PIPE_PUSH"; +#endif }