fix vm test configuration to specify vm/cc

tools/testing/dart/test_suite.dart

 // Copyright (c) 2012, 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.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 82 matching lines @@
  * A specialized [TestSuite] that runs tests written in C to unit test
  * the Dart virtual machine and its API.
  *
  * The tests are compiled into a monolithic executable by the build step.
  * The executable lists its tests when run with the --list command line flag.
  * Individual tests are run by specifying them on the command line.
  */
 class CCTestSuite implements TestSuite {
   Map configuration;
   final String suiteName;
+  final String testPrefix;
   String runnerPath;
   final String dartDir;
   List<String> statusFilePaths;
   Function doTest;
   Function doDone;
   ReceivePort receiveTestName;
   TestExpectations testExpectations;
 
   CCTestSuite(Map this.configuration,
-              String this.suiteName,
+              String suiteAndPrefix,

[Ivan Posva, 2012/05/02 20:05:15]

The other option would be to pass an additional parameter, then you can remove
all of the smarts to split this into pieces.

[Siggi Cherem (dart-lang), 2012/05/02 20:34:39]

Done.

               String runnerName,
               List<String> this.statusFilePaths)
-      : dartDir = TestUtils.dartDir() {
+      : dartDir = TestUtils.dartDir(),
+        suiteName = _suiteName(suiteAndPrefix),

[Siggi Cherem (dart-lang), 2012/05/02 17:47:03]

I'm not convinced this is the best approach to do this. In particular, it seems
that CCTestSuite has a single use (to be extended by VMTestSuite). So this
splitting of suite and test-prefix feels overgeneralized. I was contemplating if
we should merge the two somehow? Any other suggestions?

[Ivan Posva, 2012/05/02 20:05:15]

Another option would be that the CCTestSuite expects a prefix of 'cc' by
default.

[Siggi Cherem (dart-lang), 2012/05/02 20:34:39]

Done.

+        testPrefix = _testPrefix(suiteAndPrefix) {
     runnerPath = TestUtils.buildDir(configuration) + '/' + runnerName;
   }
 
   void testNameHandler(String testName, ignore) {
     if (testName == "") {
       receiveTestName.close();
       doDone(true);
     } else {
       // Only run the tests that match the pattern. Use the name
       // "suiteName/testName" for cc tests.
       RegExp pattern = configuration['selectors'][suiteName];
-      String constructedName = '$suiteName/$testName';
+      String constructedName = '$suiteName/$testPrefix$testName';
       if (!pattern.hasMatch(constructedName)) return;
 
-      var expectations = testExpectations.expectations(testName);
+      var expectations = testExpectations.expectations(
+          '$testPrefix$testName');
 
       if (configuration["report"]) {
         SummaryReport.add(expectations);
       }
 
       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));
 
-      doTest(new TestCase('$suiteName/$testName',
+      doTest(new TestCase(constructedName,
                           [new Command(runnerPath, args)],
                           configuration,
                           completeHandler,
                           expectations));
     }
   }
 
   void forEachTest(Function onTest, Map testCache, String globalTempDir(),
                    [Function onDone]) {
     doTest = onTest;
@@ skipping 15 matching lines @@
     for (var statusFilePath in statusFilePaths) {
       ReadTestExpectationsInto(testExpectations,
                                '$dartDir/$statusFilePath',
                                configuration,
                                statusFileRead);
     }
   }
 
   void completeHandler(TestCase testCase) {
   }
+
+  /**
+   * Extract the suite name from a string that may include a test prefix, for
+   * instance return "suite" if s = "suite/prefix" or if s = "suite".
+   */
+  static _suiteName(String s) {
+    int index = s.indexOf('/');
+    if (index == -1) return s;
+    return s.substring(0, index);
+  }
+
+  /**
+   * Returns a test prefix "prefix/" derived from a string of the form
+   * "suite/prefix". If no prefix is specified (e.g. s = "suite") return an
+   * empty string.
+   */
+  static _testPrefix(String s) {
+    int index = s.indexOf('/');
+    if (index == -1) return '';
+    return '${s.substring(index + 1)}/';
+  }
 }
 
 
 class TestInformation {
   String filename;
   Map optionsFromFile;
   bool isNegative;
   bool isNegativeIfChecked;
   bool hasFatalTypeErrors;
   bool hasRuntimeErrors;
@@ skipping 1205 matching lines @@
  * $noCrash tests are expected to be flaky but not crash
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
 """;
     print(report);
    }
 }