From 40fc6bb7f5037119b6b6395498109be77cee1cb8 Mon Sep 17 00:00:00 2001
From: Erin Melucci <emelucci@opera.com>
Date: Mon, 19 Jan 2026 17:46:24 +0100
Subject: [PATCH] Don't rebuild the project between test restarts (GMRT)

---
 classes/commands/RunTestsCommand.py | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/classes/commands/RunTestsCommand.py b/classes/commands/RunTestsCommand.py
index a425123d..8b2a4ede 100644
--- a/classes/commands/RunTestsCommand.py
+++ b/classes/commands/RunTestsCommand.py
@@ -1,10 +1,11 @@
 import argparse
+import logging
 import os
 import requests
 import shutil
-from pathlib import Path
 import subprocess
-from typing import Any
+from pathlib import Path
+
 from classes.server.RemoteControlServer import (RemoteControlServer, ExecutionMode)
 from classes.commands.BaseCommand import DEFAULT_CONFIG, HTTP_PORT, TCP_PORT, BaseCommand
 from classes.server.TestFrameworkServer import manage_server
@@ -71,10 +72,18 @@ async def execute(self) -> None:
         # Ensure correct project format
         self._run_project_tool(project_tool_path, core_resources_path)
         
-        # Build server arguments
-        args = self._build_server_arguments()
+        try:
+            build_job, run_job = self.get_argument("build_jobs").split(";")
+        except:
+            logging.error(f"Invalid build jobs format: {self.get_argument('build_jobs')}. Expected format: <build_job>;<run_job>")
+            return
+        
+        # Build the project first
+        await async_utils.run_exe(gmrt_exe, self._build_gmrt_arguments(build_job))
 
-        # Start the server
+        # Now we can start the remote control server to run tests.
+        # This two-step approach prevents rebuilding the project on restarts (test timeout, crash, ...)
+        args = self._build_gmrt_arguments(run_job)
         remote = RemoteControlServer(ExecutionMode.AUTOMATIC, run_name=run_name)
         await manage_server(
             lambda: remote.serve_or_wait_for_space(gmrt_exe, args, port=TCP_PORT), 
@@ -143,13 +152,13 @@ def _run_project_tool(self, project_tool_path: Path, core_resources_path: Path)
         os.environ["PREFABS"] = self.get_argument('prefab_dir')
         subprocess.run([PROJECT_SCRIPT_PATH], check=True)
 
-    def _build_server_arguments(self) -> list[str]:
+    def _build_gmrt_arguments(self, build_jobs: str) -> list[str]:
         """Builds the argument list for the server."""
         args = [
             self.get_argument("project_path"),
             "-o", self.get_argument("output_folder"),
             f"-bg={self.get_argument('build_graph')}",
-            f"-bj={self.get_argument('build_jobs')}",
+            f"-bj={build_jobs}",
             f"--build-type={self.get_argument('build_type')}",
             f"--script-build-type={self.get_argument('script_build_type')}",
             f"--prefab-dir={self.get_argument('prefab_dir')}"