tools/test.dart: Enable // DartOptions= lines in Dart test runner.

tests/corelib/test_config.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #library("corelib_test_config");
 
 #import("../../tools/testing/dart/test_runner.dart");
 #import("../../tools/testing/dart/status_file_parser.dart");
 
 class CorelibTestSuite {
@@ skipping 43 matching lines @@
     //               until they are handled correctly.
     if (expectations.contains(SKIP)) return;
 
     List args = ["--ignore-unrecognized-flags"];
     if (configuration["checked"]) {
       args.add("--enable_type_checks");
     }
     if (configuration["component"] == "leg") {
       args.add("--enable_leg");
     }
-    args.add(filename);
 
-    List<List> optionsList = testOptions(filename);
+    var optionsFromFile = testOptions(filename);
+    List<List<String>> optionsList = optionsFromFile["vmOptions"];
+    List<String> dartOptions = optionsFromFile["dartOptions"];
+    args.addAll(dartOptions == null ? [filename] : dartOptions);
+
     if (optionsList.isEmpty()) {
       doTest(new TestCase(testName,
                           shellPath,
                           args,
                           configuration["timeout"],
                           completeHandler,
                           expectations));
     } else {
       for (var options in optionsList) {
         options.addAll(args);
         doTest(new TestCase(testName,
                             shellPath,
                             options,
                             configuration["timeout"],
                             completeHandler,
                             expectations));
       }        
     }
   }
 
-  List<List> testOptions(String filename) {
+  Map testOptions(String filename) {
     RegExp testOptionsRegExp = const RegExp(@"// VMOptions=(.*)");
+    RegExp dartOptionsRegExp = const RegExp(@"// DartOptions=(.*)");
     File file = new File(filename);
     FileInputStream fileStream = file.openInputStream();
     StringInputStream lines = new StringInputStream(fileStream);
 
     List<List> result = new List<List>();
+    List<String> dartOptions;
     String line;
     while ((line = lines.readLine()) != null) {
       Match match = testOptionsRegExp.firstMatch(line);
       if (match != null) {
         result.add(match[1].split(' ').filter((e) => e != ''));
       }
+
+      match = dartOptionsRegExp.firstMatch(line);
+      if (match != null) {
+        if (dartOptions != null) {
+          throw new Exception(
+              'More than one "// DartOptions=" line in test $filename');
+        }
+        dartOptions = match[1].split(' ').filter((e) => e != '');
+      }
     }
-    return result;
+    return {"vmOptions": result, "dartOptions": dartOptions};
   }
   
   void completeHandler(TestCase testCase) {
   }
 }