Allow single-dash options to be specified without a space before value.

tools/testing/dart/test_suite.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("test_suite");
 
 #import("status_file_parser.dart");
 #import("test_runner.dart");
 #import("multitest.dart");
 
@@ skipping 51 matching lines @@
     runnerPath = TestUtils.buildDir(configuration) + runnerName;
   }
 
   void complexStatusMatching() => false;
 
   void testNameHandler(String testName, ignore) {
     if (testName == "") {
       receiveTestName.close();
       doDone(true);
     } else {
-      // If patterns are given only list the files that match one of the
-      // patterns. Use the name "suiteName/testName" for cc tests.
-      var patterns = configuration['patterns'];
-      if (!patterns.isEmpty()) {
-        var constructedName = '$suiteName/$testName';
-        if (!patterns.some((re) => re.hasMatch(constructedName))) return;
-      }
+      // Only run the tests that match the pattern. Use the name

[Bill Hesse, 2011/12/02 10:21:05]

Are you only allowing one pattern per suite?  What if I say
test.dart standalone/Black standalone/File ?

[Mads Ager (google), 2011/12/02 10:36:53]

If you want that you probably have a failure and want only one of them at a time
anyway. I don't think there will be a need for that.

+      // "suiteName/testName" for cc tests.
+      RegExp pattern = configuration['selectors'][suiteName];
+      String constructedName = '$suiteName/$testName';
+      if (!pattern.hasMatch(constructedName)) return;
 
       var expectations = testExpectations.expectations(testName);
 
       if (expectations.contains(SKIP)) return;
 
       // The cc test runner takes options after the name of the test
       // to run.
       var args = [testName];
       args.addAll(TestUtils.standardOptions(configuration));
       var timeout = configuration['timeout'];
@@ skipping 28 matching lines @@
     });
   }
 
   void completeHandler(TestCase testCase) {
   }
 }
 
 
 class StandardTestSuite implements TestSuite {
   Map configuration;
+  String suiteName;
   String directoryPath;
   List<String> statusFilePaths;
   Function doTest;
   Function doDone;
   int activeMultitests = 0;
   bool listingDone = false;
   String shellPath;
   TestExpectations testExpectations;
 
   StandardTestSuite(Map this.configuration,
+                    String this.suiteName,
                     String this.directoryPath,
                     List<String> this.statusFilePaths) {
     shellPath = TestUtils.dartShellFileName(configuration) ;
   }
 
 
   void isTestFile(String filename) => filename.endsWith("Test.dart");
 
   void listRecursively() => false;
 
@@ skipping 24 matching lines @@
       throw s;
     };
     dir.fileHandler = processFile;
     dir.doneHandler = directoryListingDone;
     dir.list(recursive: listRecursively());
   }
 
   void processFile(String filename) {
     if (!isTestFile(filename)) return;
 
-    // If patterns are given only list the files that match one of the
-    // patterns.
-    var patterns = configuration['patterns'];
-    if (!patterns.isEmpty() &&
-        !patterns.some((re) => re.hasMatch(filename))) {
-      return;
-    }
-
+    // Only run the tests that match the pattern.
+    RegExp pattern = configuration['selectors'][suiteName];
+    if (!pattern.hasMatch(filename)) return;
 
     var timeout = configuration['timeout'];
     var optionsFromFile = optionsFromFile(filename);
 
     Function createTestCase(String filename,
                             bool isNegative,
                             [bool isNegativeIfChecked = false]) {
       // Look up expectations in status files using a modified file path.
       String pathSeparator = new Platform().pathSeparator();
       String testName;
@@ skipping 199 matching lines @@
       args.add("--enable_leg");
     }
     if (configuration["component"] == "dartc") {
       if (configuration["mode"] == "release") {
         args.add("--optimize");
       }
     }
     return args;
   }
 }