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

Unified Diff: testing/dart/test_suite.dart

Issue 8773006: Fork test scripts to support special runtime checkout. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/tools/
Patch Set: Created 9 years, 1 month 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
« testing/dart/multitest.dart ('K') | « testing/dart/test_progress.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/dart/test_suite.dart
===================================================================
--- testing/dart/test_suite.dart (revision 1975)
+++ testing/dart/test_suite.dart (working copy)
@@ -263,7 +263,19 @@
List<String> dartOptions = optionsFromFile["dartOptions"];
List<List<String>> vmOptionsList = optionsFromFile["vmOptions"];
Expect.isTrue(!isMultitest || dartOptions == null);
- args.addAll(dartOptions == null ? [filename] : dartOptions);
+ if (dartOptions == null) {
+ args.add(filename);
+ } else {
+ var filename = dartOptions[0];
+ // TODO(ager): Get rid of this hack when the runtime checkout goes away.
+ var file = new File(filename);
+ if (!file.existsSync()) {
+ filename = '../$filename';
+ Expect.isTrue(new File(filename).existsSync());
+ dartOptions[0] = filename;
+ }
+ args.addAll(dartOptions);
+ }
var result = new List<List<String>>();
Expect.isFalse(vmOptionsList.isEmpty(), "empty vmOptionsList");
« testing/dart/multitest.dart ('K') | « testing/dart/test_progress.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698