Fix merge bug.

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 1028 matching lines @@
     // browser test. For running Dart in DRT, this will be noop commands.
     var commands = <Command>[];
 
     switch (configuration.compiler) {
       case Compiler.dart2js:
         commands.add(_dart2jsCompileCommand(
             fileName, jsWrapperFileName, tempDir, optionsFromFile));
         break;
 
       case Compiler.dartdevc:
-        var toPath = new Path('$compilationTempDir/$nameNoExt.js')
-            .toNativePath();
-        commands.add(configuration.compilerConfiguration.createCommand(
-            dartWrapperFilename, toPath,
-            optionsFromFile["sharedOptions"] as List<String>));
+        var toPath =
+            new Path('$compilationTempDir/$nameNoExt.js').toNativePath();
+        commands.add(configuration.compilerConfiguration.createCommand(fileName,
+            toPath, optionsFromFile["sharedOptions"] as List<String>));
         break;
 
       default:
         assert(false);
     }
 
     // Some tests require compiling multiple input scripts.
     for (var name in optionsFromFile['otherScripts'] as List<String>) {
       var namePath = new Path(name);
       var fromPath = info.filePath.directoryPath.join(namePath);
       var toPath = new Path('$tempDir/${namePath.filename}.js').toNativePath();
 
       switch (configuration.compiler) {
         case Compiler.dart2js:
           commands.add(_dart2jsCompileCommand(
               fromPath.toNativePath(), toPath, tempDir, optionsFromFile));
           break;
 
         case Compiler.dartdevc:
           commands.add(configuration.compilerConfiguration.createCommand(
-              fromPath.toNativePath(), toPath,
+              fromPath.toNativePath(),
+              toPath,
               optionsFromFile["sharedOptions"] as List<String>));
           break;
       }
     }
 
     if (info.optionsFromFile['isMultiHtmlTest'] as bool) {
       // Variables for browser multi-tests.
       var subtestNames = info.optionsFromFile['subtestNames'] as List<String>;
       for (var subtestName in subtestNames) {
         _enqueueSingleBrowserTest(commands, info, '$testName/$subtestName',
@@ skipping 608 matching lines @@
 
   bool isTestFile(String filename) {
     // NOTE: We exclude tests and patch files for now.
     return filename.endsWith(".dart") &&
         !filename.endsWith("_test.dart") &&
         !filename.contains("_internal/js_runtime/lib");
   }
 
   bool get listRecursively => true;
 }