Integrate finite physical mortar assets and archive inventory regression

tools/headless_workbench.py

@@ -3,14 +3,14 @@
 Requires Linux, gamescope, Proton, and a disposable COPY of a working Tools compat prefix.
 No desktop rules or existing Wine processes are changed. This is not a dedicated server.
 """
-import argparse, json, os, shutil, signal, subprocess, time
+import argparse, fcntl, json, os, shutil, signal, subprocess, time
 from pathlib import Path
 ROOT = Path(__file__).resolve().parents[1]
 p = argparse.ArgumentParser(description=__doc__)
 p.add_argument('--steam', type=Path, default=Path.home()/'.local/share/Steam')
 p.add_argument('--compat', type=Path, required=True, help='Disposable cloned Proton compatdata directory outside Steam')
 p.add_argument('--profile', type=Path, required=True, help='Separate disposable successor Workbench profile')
-p.add_argument('--smoke', choices=['victory', 'lost-helicopter', 'player-death', 'radio-network', 'hq-response'], default='victory')
+p.add_argument('--smoke', choices=['victory', 'lost-helicopter', 'player-death', 'radio-network', 'hq-response', 'mortar-inventory'], default='victory')
 p.add_argument('--rounds', type=int, default=2)
 p.add_argument('--timeout', type=int, default=360)
 a = p.parse_args()
@@ -19,6 +19,9 @@ if not 1 <= a.rounds <= 10 or not 60 <= a.timeout <= 1800:
  p.error('Use 1..10 rounds and a 60..1800 second timeout')
 if compat.is_relative_to(steam) or not (compat/'pfx/system.reg').is_file():
  p.error('--compat must be a disposable cloned prefix outside the Steam installation')
+prefix_lock = (compat/'.erri-workbench.lock').open('a')
+try: fcntl.flock(prefix_lock, fcntl.LOCK_EX | fcntl.LOCK_NB)
+except BlockingIOError: p.error('Another test runner owns this disposable Wine prefix')
 if profile.is_relative_to(ROOT) or profile.is_relative_to(steam):
  p.error('--profile must be outside source and Steam directories')
 if not shutil.which('gamescope') or not shutil.which('pactl'): p.error('gamescope and pactl are required')
@@ -99,12 +102,19 @@ with (profile/'headless-launch.log').open('w') as output:
    if child.poll() is not None: result = 'process-exited'; break
    time.sleep(1)
  finally:
+  # Stop Wine in this disposable prefix only. Proton's reaper may create a
+  # separate process group, so killing Gamescope alone can leave Wine alive.
+  wine_server = proton.parent/'files/bin/wineserver'
+  subprocess.run([str(wine_server), '-k'], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=10)
   # Only this fresh process group belongs to the runner and disposable prefix.
   try: os.killpg(child.pid, signal.SIGTERM)
   except ProcessLookupError: pass
   try: child.wait(timeout=10)
   except subprocess.TimeoutExpired:
    os.killpg(child.pid, signal.SIGKILL); child.wait()
+  # Gamescope's reaper can outlive its parent and ignores SIGTERM.
+  try: os.killpg(child.pid, signal.SIGKILL)
+  except ProcessLookupError: pass
 summary = {'result':result, 'session':str(session) if session else None, 'rounds_required':a.rounds, 'display':'headless Gamescope 1280x720/30Hz', 'dedicated_server':False, 'audio':'silent sink and per-test-stream mute'}
 if session:
  (session/'runner.json').write_text(json.dumps(summary, indent=2)+'\n')