From 019d6e8ade8ad880f85135114c2c9c53ce0a5af4 Mon Sep 17 00:00:00 2001 From: Matthew Stanley <1379tech@gmail.com> Date: Sat, 17 Oct 2026 14:21:41 -0700 Subject: [PATCH] Keep replay overlay captures within the private output directory --- tools/replay_diagnostics.py | 2 ++ tools/tests/test_replay_diagnostics.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/tools/replay_diagnostics.py b/tools/replay_diagnostics.py index c6f2ae35..2947389b 100644 --- a/tools/replay_diagnostics.py +++ b/tools/replay_diagnostics.py @@ -78,6 +78,8 @@ def replay_environment(output, trace, source_env): env['SDL_AUDIODRIVER'] = 'dummy' env['SDL_AUDIO_DRIVER'] = 'dummy' env['PSX_DIAGNOSTIC_REPLAY'] = str(trace) + # The runtime can otherwise inherit capture paths from parent env files. + env['PSX_OVERLAY_CAPTURES'] = str(output / 'overlay_captures.json') # Use copied libraries before normal system libraries, without inheriting # dependencies from another AppImage mount or a developer installation. env['LD_LIBRARY_PATH'] = os.pathsep.join((str(output / 'lib'), str(output))) diff --git a/tools/tests/test_replay_diagnostics.py b/tools/tests/test_replay_diagnostics.py index 93a10c18..4e0f8b6e 100644 --- a/tools/tests/test_replay_diagnostics.py +++ b/tools/tests/test_replay_diagnostics.py @@ -209,11 +209,15 @@ class Preparation(unittest.TestCase): 'RECOMP_DATA_DIR': '/personal/data', 'RECOMP_SEED_ONLY': '1', 'LD_LIBRARY_PATH': '/personal/lib', 'PSX_LOAD_SLOT': '7', 'PSX_SPEED': '2', 'PSX_DIAGNOSTIC_REPLAY': '/personal/inputs.csv', 'PATH': 'system path'} + original['PSX_OVERLAY_CAPTURES'] = '/personal/overlay_captures.json' trace = output / 'replay-inputs.csv' env = replay.replay_environment(output, trace, original) self.assertEqual(env['SDL_AUDIODRIVER'], 'dummy') self.assertEqual(env['SDL_AUDIO_DRIVER'], 'dummy') self.assertEqual(env['PSX_DIAGNOSTIC_REPLAY'], str(trace)) + self.assertEqual(env['PSX_OVERLAY_CAPTURES'], str(output / 'overlay_captures.json')) + clean = replay.replay_environment(output, trace, {'PATH': 'system path'}) + self.assertEqual(clean['PSX_OVERLAY_CAPTURES'], str(output / 'overlay_captures.json')) self.assertEqual(env['LD_LIBRARY_PATH'], os.pathsep.join((str(output / 'lib'), str(output)))) self.assertEqual(env['PSX_LOAD_SLOT'], '0') self.assertEqual(env['PATH'], 'system path')