Improved self-cleaning tests.

tests/foreground_focus_test.py

@@ -4,9 +4,16 @@ from pathlib import Path
 import subprocess
 import sys
 
+from wine_test_environment import run_wine_test
+
 buildDir = Path(sys.argv[1]).resolve()
+if "WINE_ACCESS_TEST_ROOT" not in os.environ:
+    sys.exit(run_wine_test([sys.executable, __file__, str(buildDir)], buildDir,
+                          "foreground-focus", timeout=90,
+                          keep=os.environ.get("WINE_ACCESS_TEST_KEEP") == "1",
+                          keepOnFailure=os.environ.get("WINE_ACCESS_TEST_KEEP_ON_FAILURE", "1") != "0"))
 env = os.environ.copy()
-env.update(WINEPREFIX=str(buildDir / "focus-prefix"),
+env.update(WINEPREFIX=os.environ["WINEPREFIX"],
            CTHULHU_WINE_ACCESS_MANAGED="1", WINEDEBUG="-all",
            WINEDLLOVERRIDES="mscoree,mshtml=")
 try: