Enable frogium component in test.dart.

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 237 matching lines @@
     }
     Set<String> expectations = testExpectations.expectations(testName);
     if (configuration["report"]) {
       // Tests with multiple VMOptions are counted more than once.
       for (var dummy in optionsFromFile["vmOptions"]) {
         SummaryReport.add(expectations);
       }
     }
     if (expectations.contains(SKIP)) return;
 
-    if (configuration['component'] == 'dartium') {
-      enqueueDartiumTest(filename, testName, optionsFromFile,
-                         expectations, isNegative);
-      return;
-    }
-    if (configuration['component'] == 'chromium') {
-      enqueueChromiumTest(filename, testName, optionsFromFile,
-                         expectations, isNegative);
-      return;
-    }
+    switch (configuration['component']) {
+      case 'dartium':
+        enqueueDartiumTest(filename, testName, optionsFromFile,

[Bill Hesse, 2011/12/22 13:26:02]

I plan to merge Dartium and Chromium/Frogium in the next change.

+                           expectations, isNegative);
+        break;
+      case 'chromium':
+      case 'frogium':
+        enqueueChromiumTest(filename, testName, optionsFromFile,
+                              expectations, isNegative);

[Mads Ager (google), 2011/12/22 15:22:59]

indentation.

+        break;
+      default:
+        // Only dartc supports fatal type errors. Enable fatal type
+        // errors with a flag and treat tests that have fatal type
+        // errors as negative.
+        var enableFatalTypeErrors =
+            (info.hasFatalTypeErrors && configuration['component'] == 'dartc');
+        var argumentLists = argumentListsFromFile(filename,
+                                                  optionsFromFile,
+                                                  enableFatalTypeErrors);
+        isNegative = isNegative ||
+            (configuration['checked'] && info.isNegativeIfChecked) ||
+            enableFatalTypeErrors;
 
-    // Only dartc supports fatal type errors. Enable fatal type
-    // errors with a flag and treat tests that have fatal type
-    // errors as negative.
-    var enableFatalTypeErrors =
-        (info.hasFatalTypeErrors && configuration['component'] == 'dartc');
-    var argumentLists = argumentListsFromFile(filename,
-                                              optionsFromFile,
-                                              enableFatalTypeErrors);
-    isNegative = isNegative ||
-        (configuration['checked'] && info.isNegativeIfChecked) ||
-        enableFatalTypeErrors;
-
-    for (var args in argumentLists) {
-      doTest(new TestCase('$suiteName/$testName',
-                          shellPath(),
-                          args,
-                          configuration,
-                          completeHandler,
-                          expectations,
-                          isNegative));
+        for (var args in argumentLists) {
+          doTest(new TestCase('$suiteName/$testName',
+                              shellPath(),
+                              args,
+                              configuration,
+                              completeHandler,
+                              expectations,
+                              isNegative));
+        }
     }
   }
 
   Function makeTestCaseCreator(Map optionsFromFile) {
     return (String filename,
             bool isNegative,
             [bool isNegativeIfChecked = false,
              bool hasFatalTypeErrors = false]) {
       // Cache the test information for each test case.
       var info = new TestInformation(filename,
@@ skipping 148 matching lines @@
       new Directory(outputDirBase).createSync();
     }
     Directory tempDir = new Directory(
         '$outputDirBase/${testRelativeDirFlattened}_$testNameBase');
     if (!tempDir.existsSync()) {
       tempDir.createSync();
     }
 
     String dartWrapperFilename = '${tempDir.path}/test.dart';
     String compiledDartWrapperFilename = '${tempDir.path}/test.js';
+    String domInWrapper = 'dart:dom';

[Mads Ager (google), 2011/12/22 15:22:59]

How about domLibraryImport? I think the name should be a bit more specific.

+    if (configuration['component'] == 'chromium') {
+      domInWrapper = '$dartDir/client/testing/unittest/dom_for_unittest.dart';
+    }
+
     if (!isWebTest) {
       // test.dart will import the dart test directly, if it is a library,
       // or indirectly through test_as_library.dart, if it is not.
       String dartLibraryFilename;
       if (isLibraryDefinition) {
         dartLibraryFilename = testPath;
       } else {
         dartLibraryFilename = 'test_as_library.dart';
         File file = new File('${tempDir.path}/$dartLibraryFilename');
         RandomAccessFile dartLibrary = file.openSync(writable: true);
         dartLibrary.writeStringSync(WrapDartTestInLibrary(testPath));
         dartLibrary.closeSync();
       }  
       
       File file = new File(dartWrapperFilename);
       RandomAccessFile dartWrapper = file.openSync(writable: true);
       dartWrapper.writeStringSync(DartTestWrapper(
-          '$dartDir/client/testing/unittest/dom_for_unittest.dart',
+          domInWrapper,
           '$dartDir/tests/isolate/src/TestFramework.dart',
           dartLibraryFilename));
       dartWrapper.closeSync();
     } else {
       return;  // TODO(whesse): Implement client web tests on dartium.
     }
     // Create the HTML file for the test.
     File htmlTestBase = new File('${tempDir.path}/${getHtmlName(filename)}');
     RandomAccessFile htmlTest = htmlTestBase.openSync(writable: true);
     htmlTest.writeStringSync(GetHtmlContents(
         filename,
         '$dartDir/client/testing/unittest/test_controller.js',
         scriptType,
         compiledDartWrapperFilename));
     htmlTest.closeSync();
 
     for (var vmOptions in optionsFromFile["vmOptions"]) {
-      List<String> dartcArgs = ['--work', tempDir.path];
-      if (configuration['mode'] ==  'release') {
-        dartcArgs.add('--optimize');
+      List<String> compilerArgs;
+      String compilerExecutable = TestUtils.compilerPath(configuration);
+      switch (configuration['component']) {
+        case 'chromium':
+          compilerArgs = ['--work', tempDir.path];
+          if (configuration['mode'] ==  'release') {
+            compilerArgs.add('--optimize');
+          }
+          compilerArgs.addAll(vmOptions);
+          compilerArgs.add('--ignore-unrecognized-flags');
+          compilerArgs.add('--out');
+          compilerArgs.add(compiledDartWrapperFilename);
+          compilerArgs.add(dartWrapperFilename);
+          // TODO(whesse): Add --fatal-type-errors if needed.
+          break;
+        case 'frogium':
+          compilerArgs = ['--libdir=$dartDir/frog/lib',
+                          '--compile-only',
+                          '--out=$compiledDartWrapperFilename'];
+          compilerArgs.addAll(vmOptions);
+          compilerArgs.add(dartWrapperFilename);
+          break;
+        default:
+          Expect.fail('unimplemented component ${configuration['component']}');
       }
-      dartcArgs.addAll(vmOptions);
-      dartcArgs.add('--ignore-unrecognized-flags');
-      dartcArgs.add('--out');
-      dartcArgs.add(compiledDartWrapperFilename);
-      dartcArgs.add(dartWrapperFilename);
-      // TODO(whesse): Add --fatal-type-errors if needed.
+
       var args = ['--no-timeout'];
       args.add(htmlTestBase.fullPathSync());
 
       // Create BrowserTestCase and queue it.
       var testCase = new BrowserTestCase(
           testName,
-          TestUtils.dartcCompilationShellPath(configuration),
-          dartcArgs,
+          compilerExecutable,
+          compilerArgs,
           dumpRenderTreeFilename,
           args,
           configuration,
           completeHandler,
           expectations,
           optionsFromFile['isNegative']);
       doTest(testCase);
     }        
   }
 
   String get scriptType() {
     switch (configuration['component']) {
       case 'dartium':
         return 'application/dart';
       case 'chromium':
+      case 'frogium':
         return 'text/javascript';
       default:
         Expect.fail('Unimplemented component scriptType');
         return null;
     }
   }
 
   String get scriptName() {
     switch (configuration['component']) {
       case 'dartium':
         return tempDir.path + 'test.dart';
       case 'chromium':
+      case 'frogium':
         return tempDir.path + 'test.js';
       default:
         Expect.fail('Unimplemented component scriptType');
         return null;
     }
   }
 
   String getHtmlName(String filename) {
     switch (configuration['component']) {
       case 'dartium':
         return filename.replaceAll(pathSeparator, '_') + 'dartium.html';
       case 'chromium':
+      case 'frogium':
         return 'test.html';
       default:
         Expect.fail('Unimplemented component scriptType');
         return null;
     }
   }
 
   String get dumpRenderTreeFilename() {
     if (new Platform().operatingSystem() == 'macos') {
       return 'client/tests/drt/DumpRenderTree.app/Contents/' +
@@ skipping 153 matching lines @@
               expectations);
 
   void activityStarted() => ++activityCount;
 
   void activityCompleted() {
     if (--activityCount == 0) {
       directoryListingDone(true);
     }
   }
 
-  String shellPath() => TestUtils.dartcCompilationShellPath(configuration);
+  String shellPath() => TestUtils.compilerPath(configuration);
 
   List<String> additionalOptions() {
     // TODO(ager): potentially register cleanup action to delete the temporary
     // directories?
     var tempDir = new Directory('');
     tempDir.createTempSync();
     return ['-check-only', '-fatal-type-errors', '-Werror', '-out', tempDir.path];
   }
 
   void processDirectory() {
@@ skipping 30 matching lines @@
       case 'frog':
       case 'leg':
           return 'frog/bin/frog$postfix';
       case 'frogsh':
         return 'frog/bin/frogsh$postfix';
       default:
         throw "Unknown executable for: ${configuration['component']}";
     }
   }
 
+  static String compilerName(Map configuration) {
+    String postfix =
+        (new Platform().operatingSystem() == 'windows') ? '.exe' : '';
+    switch (configuration['component']) {
+      case 'chromium':

[Bill Hesse, 2011/12/22 13:26:02]

Add case 'dartc' here.

+        return 'compiler/bin/dartc$postfix';
+      case 'frogium':
+        return 'frog/bin/frogsh$postfix';
+      default:
+        throw "Unknown compiler for: ${configuration['component']}";
+    }
+  }
+
   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 dartcCompilationShellPath(Map configuration) {
-    var name = '${buildDir(configuration)}/compiler/bin/dartc';
+  static String compilerPath(Map configuration) {
+    var name = '${buildDir(configuration)}/${compilerName(configuration)}';
     if (!(new File(name)).existsSync()) {
       throw "Executable '$name' does not exist";
     }
     return name;
   }
 
   static String outputDir(Map configuration) {
     var outputDir = '';
     var system = configuration['system'];
     if (system == 'linux') {
@@ skipping 75 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);
   }
 }