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

Unified Diff: tests/compiler/dart2js/zero_termination_test.dart

Issue 2234343004: Fix zero_termination tests in the bots (fixes #27066) (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/compiler/dart2js/zero_termination_test.dart
diff --git a/tests/compiler/dart2js/zero_termination_test.dart b/tests/compiler/dart2js/zero_termination_test.dart
index fbfeab756a0d2f6ddd1743c8115e3901b432c878..9581e48a64bb036ac8c731716672e3c3ac58429a 100644
--- a/tests/compiler/dart2js/zero_termination_test.dart
+++ b/tests/compiler/dart2js/zero_termination_test.dart
@@ -47,11 +47,14 @@ void cleanup() {
}
Future launchDart2Js(args) {
- String ext = Platform.isWindows ? '.bat' : '';
- String command =
- path.normalize(path.join(path.fromUri(Platform.script),
- '../../../../sdk/bin/dart2js${ext}'));
- return Process.run(command, args, stdoutEncoding: null);
+ String executable = Platform.executable;
+ String command = path.join(path.dirname(executable), 'dart2js');
+ String dart2jsPath = path.normalize(
Bill Hesse 2016/08/12 19:01:31 Maybe check if this exists, and don't fail if it i
Siggi Cherem (dart-lang) 2016/08/12 20:21:14 I'd be afraid that the test would be "passing" but
+ path.join(path.fromUri(Platform.script),
+ '../../../../pkg/compiler/lib/src/dart2js.dart'));
+ List allArgs = ['--package-root=${Platform.packageRoot}',
Bill Hesse 2016/08/12 19:01:31 I'm just working on removing packageRoot from test
Siggi Cherem (dart-lang) 2016/08/12 20:21:14 good point - we should fix it to pass along whiche
+ dart2jsPath]..addAll(args);
+ return Process.run(Platform.executable, allArgs, stdoutEncoding: null);
}
void check(ProcessResult result) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698