noforward

Author: slipher

tools/crash_test.py

@@ -65,6 +65,8 @@ def Do(self):
         vmtype = "0" if SYMBOL_ZIPS else "1"
         print("Running daemon...")
         p = subprocess.run([self.engine,
+                            "-noforward", # catch stupid Linux persistent sockets (if gamelogic test...)
+                            "-homepath", self.dir,
                             "-set", "vm.sgame.type", vmtype,
                             "-set", "vm.cgame.type", vmtype,
                             "-set", "sv_fps", "1000",
@@ -74,7 +76,6 @@ def Do(self):
                             "-set", "net_enabled", "0",
                             "-set", "common.framerate.max", "0",
                             "-set", "cg_navgenOnLoad", "0",
-                            "-homepath", self.dir,
                             *DAEMON_USER_ARGS,
                             *["+devmap plat23"] * (self.tprefix == "sgame."),
                             "+delay 20f echo CRASHTEST_BEGIN",
@@ -104,7 +105,7 @@ def Virtualize(cmdline):
             vm = parts[3]
             path = "/" + "/".join(parts[4:])
             return ["wsl", "-d", vm, "--", path] + args
-        if bin.endswith(".py"):
+        elif bin.endswith(".py"):
             return [sys.executable] + cmdline
     return cmdline
 
@@ -157,7 +158,7 @@ def ArgParser(usage=None):
     ap = argparse.ArgumentParser(
         usage=usage,
         description="Verify that Breakpad toolchain can produce usable stack traces."
-                    " A Daemon build must be found in the current directory. Also Breakpad's tools must be built in its source tree."
+                    " A Daemon build must be found in the current directory (or --game-dir). Also Breakpad's tools must be built in its source tree."
                     " If a symbols zip is found in the current directory, enter release validation mode: prebuilt symbols are used and VM type defaults to 0 (NaCl from paks)."
                     " Otherwise, enter end-to-end mode: symbols are produced from the binaries and VM type defaults to 1 (NaCl from PWD). In this mode you will likely need to provide pak paths via --daemon-args.")
     ap.add_argument("--game-dir", type=str, default=".", help="Path to Daemon (+ gamelogic) binaries")