deqp: Fix invoking gdb

Author: Wallbraker

src/deqp/driver.volt

@@ -5,10 +5,13 @@
  */
 module deqp.driver;
 
+import core.exception;
+
 import watt = [
 	watt.path,
 	watt.io.streams,
 	watt.io.monotonic,
+	watt.process.spawn,
 	watt.algorithm,
 	watt.xdg.basedir,
 	watt.text.getopt,
@@ -36,6 +39,7 @@ public:
 	noRerunTests: bool = false;
 	noPassedResults: bool = false;
 	invokeWithGDB: bool = false;
+	gdbCommand: string;
 	printOpts: PrintOptions;
 
 	batchSize: u32;
@@ -114,6 +118,12 @@ public:
 			return ret;
 		}
 
+		if (settings.invokeWithGDB) try {
+			settings.gdbCommand = watt.getCommandFromName("gdb");
+		} catch (Exception e) {
+			abort(e.msg);
+		}
+
 		// Tell the user what is going on.
 		printConfig(settings);
 

src/deqp/tests/runner.volt

@@ -147,7 +147,7 @@ public:
 				"-ex", "stop",
 				"-ex", "q",
 				"--args", cmd] ~ args;
-			cmd = "gdb";
+			cmd = s.gdbCommand;
 		}
 
 		console := new watt.OutputFileStream(fileConsole);
@@ -160,7 +160,7 @@ public:
 
 		timeStart = watt.ticks();
 
-		launcher.run(suite.command, args, ss.toString(), console, done);
+		launcher.run(cmd, args, ss.toString(), console, done);
 		console.close();
 	}