Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Unified Diff: tools/testing/dart/test_runner.dart

Issue 2672243005: test.dart: Find cdb.exe automatically from depot_tools when running Windows tests (Closed)
Patch Set: add comments Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/testing/dart/test_runner.dart
diff --git a/tools/testing/dart/test_runner.dart b/tools/testing/dart/test_runner.dart
index 8402519cfb423e29fe4e3f677e05bcfd43daa3c2..d9e8d132253ae435c97d3e29f39c16932fd51ab5 100644
--- a/tools/testing/dart/test_runner.dart
+++ b/tools/testing/dart/test_runner.dart
@@ -1827,9 +1827,13 @@ class RunningProcess {
List<String> diagnostics = <String>[];
bool compilationSkipped = false;
Completer<CommandOutput> completer;
+ Map configuration;
List<String> preArguments;
- RunningProcess(this.command, this.timeout, {this.preArguments});
+ RunningProcess(this.command,
+ this.timeout,
+ {this.configuration,
+ this.preArguments});
Future<CommandOutput> run() {
completer = new Completer<CommandOutput>();
@@ -1908,7 +1912,11 @@ class RunningProcess {
executable = '/usr/bin/sample';
arguments = ['${process.pid}', '1', '4000', '-mayDie'];
} else if (io.Platform.isWindows) {
- executable = "cdb.exe";
+ bool is_x64 = command.executable.contains("X64") ||
+ command.executable.contains("SIMARM64");
+ executable = configuration['win_sdk_path'] +
+ "\\Debuggers\\" + (is_x64 ? "x64" : "x86") + "\\cdb.exe";
+ diagnostics.add("Using $executable to print stack traces");
arguments = ['-p', '${process.pid}', '-c', '!uniqstack;qd'];
}
@@ -2709,14 +2717,17 @@ class CommandExecutorImpl implements CommandExecutor {
} else if (command is VmCommand && command.needsDFERunner) {
final runner = _getDFEProcess();
return runner.acquire().then((port) {
- return new RunningProcess(command, timeout, preArguments: ['-DDFE_WORKER_PORT=${port}']).run();
+ return new RunningProcess(command, timeout,
+ configuration: globalConfiguration,
+ preArguments: ['-DDFE_WORKER_PORT=${port}']).run();
}).whenComplete(() => runner.release());
} else if (command is VmBatchCommand) {
var name = command.displayName;
return _getBatchRunner(command.displayName + command.dartFile)
.runCommand(name, command, timeout, command.arguments);
} else {
- return new RunningProcess(command, timeout).run();
+ return new RunningProcess(
+ command, timeout, configuration: globalConfiguration).run();
}
}
« tools/testing/dart/test_configurations.dart ('K') | « tools/testing/dart/test_configurations.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698