Various test script changes:

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");
 
 interface TestSuite {
@@ skipping 27 matching lines @@
         replyTo.send("");
       };
       p.start();
     });
   }
 }
 
 
 class CCTestSuite implements TestSuite {
   Map configuration;
+  String suiteName;
   String runnerPath;
   List<String> statusFilePaths;
   Function doTest;
   Function doDone;
   ReceivePort receiveTestName;
   TestExpectations testExpectations;
 
   CCTestSuite(Map this.configuration,
+              String this.suiteName,
               String runnerName,
               List<String> this.statusFilePaths) {
-    runnerPath = TestUtils.getBuildDir(configuration) + runnerName;
+    runnerPath = TestUtils.buildDir(configuration) + runnerName;
   }
 
   void complexStatusMatching() => false;
 
   void testNameHandler(String testName, ignore) {
     if (testName == "") {
       receiveTestName.close();
       doDone(true);
     } else {
-      var timeout = configuration['timeout'];
+      // 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;
+      }
+
       var expectations = testExpectations.expectations(testName);
 
       if (expectations.contains(SKIP)) return;
 
-      // TODO(ager): Pass extra options to the tests.
+      // 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'];
 
-      // TODO(ager): Actually filter out the tests that we don't want
-      // to run based on the patterns.
       doTest(new TestCase(testName,
                           runnerPath,
-                          [testName],
+                          args,
                           timeout,
                           completeHandler,
                           expectations));
+
       receiveTestName.receive(testNameHandler);
     }
   }
 
   void forEachTest(Function onTest, [Function onDone]) {
     doTest = onTest;
     doDone = (ignore) => (onDone != null) ? onDone() : null;
 
     testExpectations =
         new TestExpectations(complexMatching: complexStatusMatching());
@@ skipping 20 matching lines @@
   String directoryPath;
   List<String> statusFilePaths;
   Function doTest;
   Function doDone;
   String shellPath;
   TestExpectations testExpectations;
 
   StandardTestSuite(Map this.configuration,
                     String this.directoryPath,
                     List<String> this.statusFilePaths) {
-    shellPath = TestUtils.getDartShellFileName(configuration) ;
+    shellPath = TestUtils.dartShellFileName(configuration) ;
   }
 
 
   void isTestFile(String filename) => filename.endsWith("Test.dart");
 
   void listRecursively() => false;
 
   void complexStatusMatching() => false;
 
   void forEachTest(Function onTest, [Function onDone = null]) {
@@ skipping 34 matching lines @@
       return;
     }
 
     int start = filename.lastIndexOf('src' + new Platform().pathSeparator());
     String testName = filename.substring(start + 4, filename.length - 5);
     Set<String> expectations = testExpectations.expectations(testName);
 
     if (expectations.contains(SKIP)) return;
 
     var optionsFromFile = optionsFromFile(filename);
-    var argumentLists = argumentLists(filename, optionsFromFile);
+    var isNegative = optionsFromFile['isNegative'];
+    var argumentLists = argumentListsFromFile(filename, optionsFromFile);
+    var timeout = configuration['timeout'];
+
     for (var args in argumentLists) {
-      var timeout = configuration['timeout'];
-      var isNegative = optionsFromFile['isNegative'];
       doTest(new TestCase(testName,
                           shellPath,
                           args,
                           timeout,
                           completeHandler,
                           expectations,
                           isNegative));
     }
   }
 
   void completeHandler(TestCase testCase) {
   }
 
-  List<List<String>> argumentLists(String filename, Map optionsFromFile) {
-    List args = ["--ignore-unrecognized-flags"];
-    if (configuration["checked"]) {
-      args.add('--enable_asserts');
-      args.add("--enable_type_checks");
-    }
-    if (configuration["component"] == "leg") {
-      args.add("--enable_leg");
-    }
-    if (configuration["component"] == "dartc") {
-      if (configuration["mode"] == "release") {
-        args.add("--optimize");
-      }
-    }
+
+  List<List<String>> argumentListsFromFile(String filename,
+                                           Map optionsFromFile) {
+    List args = TestUtils.standardOptions(configuration);
 
     List<String> dartOptions = optionsFromFile["dartOptions"];
     args.addAll(dartOptions == null ? [filename] : dartOptions);
 
     var result = new List<List<String>>();
     List<List<String>> vmOptionsList = optionsFromFile["vmOptions"];
     if (vmOptionsList.isEmpty()) {
       result.add(args);
     } else {
       for (var vmOptions in vmOptionsList) {
@@ skipping 51 matching lines @@
     }
 
     return { "vmOptions": result,
              "dartOptions": dartOptions,
              "isNegative" : isNegative };
   }
 }
 
 
 class TestUtils {
-  static String getExecutableName(Map configuration) {
+  static String executableName(Map configuration) {
     switch (configuration['component']) {
       case 'vm':
         return 'dart_bin';
       case 'dartc':
         return 'compiler/bin/dartc_test';
       case 'frog':
       case 'leg':
           return 'frog/bin/frog';
       case 'frogsh':
         return 'frog/bin/frogsh';
       default:
         throw "Unknown executable for: ${configuration['component']}";
     }
   }
 
 
-  static String getDartShellFileName(Map configuration) {
-    var name = getBuildDir(configuration) + getExecutableName(configuration);
+  static String dartShellFileName(Map configuration) {
+    var name = buildDir(configuration) + executableName(configuration);
     if (!(new File(name)).existsSync()) {
       throw "Executable '$name' does not exist";
     }
     return name;
   }
 
-  static String getBuildDir(Map configuration) {
+  static String buildDir(Map configuration) {
     var buildDir = '';
     var system = configuration['system'];
     if (system == 'linux') {
       buildDir = 'out/';
     } else if (system == 'macos') {
       buildDir = 'xcodebuild/';
     }
     buildDir += (configuration['mode'] == 'debug') ? 'Debug_' : 'Release_';
     buildDir += configuration['architecture'] + '/';
     return buildDir;
   }
+
+  static List<String> standardOptions(Map configuration) {
+    List args = ["--ignore-unrecognized-flags"];
+    if (configuration["checked"]) {
+      args.add('--enable_asserts');
+      args.add("--enable_type_checks");
+    }
+    if (configuration["component"] == "leg") {
+      args.add("--enable_leg");
+    }
+    if (configuration["component"] == "dartc") {
+      if (configuration["mode"] == "release") {
+        args.add("--optimize");
+      }
+    }
+    return args;
+  }
 }