Run dart2js tests unmodified in drt.

dart/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 377 matching lines @@
     Set<String> expectations = testExpectations.expectations(testName);
     if (configuration['report']) {
       // Tests with multiple VMOptions are counted more than once.
       for (var dummy in getVmOptions(optionsFromFile)) {
         SummaryReport.add(expectations);
       }
     }
     if (expectations.contains(SKIP)) return;
 
     if (TestUtils.isBrowserRuntime(configuration['runtime'])) {
-      enqueueBrowserTest(info, testName, expectations);
+      bool isWrappingRequired = configuration['compiler'] != 'dart2js'
+        || configuration['runtime'] != 'drt';

[kasperl, 2012/09/11 11:12:15]

4 space indent?

+      enqueueBrowserTest(info, testName, expectations, isWrappingRequired);
     } else {
       enqueueStandardTest(info, testName, expectations);
     }
   }
 
   void enqueueStandardTest(TestInformation info,
                            String testName,
                            Set<String> expectations) {
     bool isNegative = info.isNegative ||
         (configuration['checked'] && info.isNegativeIfChecked);
@@ skipping 113 matching lines @@
                   suiteDir,
                   createTestCase,
                   testGeneratorDone);
     } else {
       createTestCase(filePath, optionsFromFile['isNegative']);
     }
   }
 
   /**
    * The [StandardTestSuite] has support for tests that
-   * compile a test from Dart to Javascript, and then run the resulting
-   * Javascript.  This function creates a working directory to hold the
-   * Javascript version of the test, and copies the appropriate framework
+   * compile a test from Dart to JavaScript, and then run the resulting
+   * JavaScript.  This function creates a working directory to hold the
+   * JavaScript version of the test, and copies the appropriate framework
    * files to that directory.  It creates a [BrowserTestCase], which has
-   * two sequential steps to be run by the [ProcessQueue when] the test is
+   * two sequential steps to be run by the [ProcessQueue] when the test is
    * executed: a compilation
    * step and an execution step, both with the appropriate executable and
    * arguments.
    */
   void enqueueBrowserTest(TestInformation info,
                           String testName,
-                          Set<String> expectations) {
+                          Set<String> expectations,
+                          bool isWrappingRequired) {
     Map optionsFromFile = info.optionsFromFile;
     Path filePath = info.filePath;
     String filename = filePath.toString();
     bool isWebTest = optionsFromFile['containsDomImport'];
     bool isLibraryDefinition = optionsFromFile['isLibraryDefinition'];
-    if (!isLibraryDefinition && optionsFromFile['containsSourceOrImport']) {
+    if (isWrappingRequired
+        && !isLibraryDefinition && optionsFromFile['containsSourceOrImport']) {
       print('Warning for $filename: Browser tests require #library '
             'in any file that uses #import, #source, or #resource');
     }
 
     final String compiler = configuration['compiler'];
     final String runtime = configuration['runtime'];
 
     for (var vmOptions in getVmOptions(optionsFromFile)) {
       // Create a unique temporary directory for each set of vmOptions.
       // TODO(dart:429): Replace separate replaceAlls with a RegExp when
       // replaceAll(RegExp, String) is implemented.
       String optionsName = '';
       if (getVmOptions(optionsFromFile).length > 1) {
           optionsName = Strings.join(vmOptions, '-').replaceAll('-','')
                                                     .replaceAll('=','')
                                                     .replaceAll('/','');
       }
       final String tempDir = createOutputDirectory(info.filePath, optionsName);
 
       String dartWrapperFilename = '$tempDir/test.dart';
       String compiledDartWrapperFilename = '$tempDir/test.js';
 
       String htmlPath = '$tempDir/test.html';
-      if (!isWebTest) {
+      if (isWrappingRequired && !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.
         Path dartLibraryFilename = filePath;
         if (!isLibraryDefinition) {
           dartLibraryFilename = new Path('test_as_library.dart');
           File file = new File('$tempDir/$dartLibraryFilename');
           RandomAccessFile dartLibrary = file.openSync(FileMode.WRITE);
           dartLibrary.writeStringSync(wrapDartTestInLibrary(filePath));
           dartLibrary.closeSync();
         }
@@ skipping 829 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);
    }
 }