[Refactor, Test] (docs/ci, docs/Disaggregated, MG_IntegrationTest, MG_IntegrationTest/Harness, MG_IntegrationTest/Scenarios, MG_Remote/Server, MG_Test/Util, MG_Test/Wire, MG_Util/Metrics, scripts/ci, tools/trace_replay): delete the MOBILEGL_TEST_SERVER_COUNTERS knob

- CtWireScenario reads `ar` / `od` off the server's PipeStats line on every arm
- the serial == resets assertion could not fail and is dropped
- ServerVerbSink's unread BindContexts, Presents and LastPresentSerial go too
This commit is contained in:
2026-10-18 10:02:04 -04:00
parent 9824beabd1
commit ee30726fde
16 changed files with 161 additions and 185 deletions
+1 -1
View File
@@ -64,7 +64,7 @@ def run(args, case, transport, repeat):
LIBGL_ALWAYS_SOFTWARE='1', EGL_PLATFORM='surfaceless',
MESA_GL_VERSION_OVERRIDE='3.3', MESA_GLSL_VERSION_OVERRIDE='330')
for key in ('MOBILEGL_IPC_CONTROL', 'MOBILEGL_IPC_DATA', 'MOBILEGL_IPC_TOKEN', 'MOBILEGL_IPC_DIAL',
'MOBILEGL_IPC_REQUIRE_SAME_BUILD', 'MOBILEGL_TEST_SERVER_COUNTERS'):
'MOBILEGL_IPC_REQUIRE_SAME_BUILD'):
env.pop(key, None)
if transport == 'tcp':
env.update(MOBILEGL_IPC_CONTROL=args.endpoint, MOBILEGL_IPC_DATA='stream', MOBILEGL_IPC_TOKEN='',
+1 -1
View File
@@ -122,7 +122,7 @@ def run(args, transport, case, repeat):
LIBGL_ALWAYS_SOFTWARE='1', EGL_PLATFORM='surfaceless',
MESA_GL_VERSION_OVERRIDE='3.3', MESA_GLSL_VERSION_OVERRIDE='330')
for key in ('MOBILEGL_IPC_CONTROL', 'MOBILEGL_IPC_DATA', 'MOBILEGL_IPC_TOKEN', 'MOBILEGL_IPC_DIAL',
'MOBILEGL_IPC_REQUIRE_SAME_BUILD', 'MOBILEGL_TEST_SERVER_COUNTERS'):
'MOBILEGL_IPC_REQUIRE_SAME_BUILD'):
env.pop(key, None)
if Path('/usr/share/glvnd/egl_vendor.d/50_mesa.json').exists():
env['__EGL_VENDOR_LIBRARY_FILENAMES'] = '/usr/share/glvnd/egl_vendor.d/50_mesa.json'
+1 -1
View File
@@ -140,7 +140,7 @@ def start_server(args, device):
command = [sys.executable, str(script), 'start', '--serial', args.serial,
'--package', args.package, '--listen', args.listen, '--token', args.token,
'--allow-idle', '--state-file', str(args.server_idle_state), '--env',
'MOBILEGL_TEST_SERVER_COUNTERS=1;MOBILEGL_PIPE_STATS=1;MOBILEGL_PIPE_STATS_PERIOD=1;'
'MOBILEGL_PIPE_STATS=1;MOBILEGL_PIPE_STATS_PERIOD=1;'
'MOBILEGL_LOG_FILE_PATH=/data/data/' + args.package + '/files/mgl.log']
result = subprocess.run(command, check=True, capture_output=True, text=True, timeout=30)
(args.out / 'server-start.txt').write_text(result.stdout + result.stderr, encoding='utf-8')