Bugfix in test_suite.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 732 matching lines @@
                           completeHandler,
                           expectations,
                           isNegative: isNegative,
                           info: info));
     }
   }
 
   List<Command> makeCommands(TestInformation info, var vmOptions, var args) {
     switch (configuration['compiler']) {
     case 'dart2js':
-      var compiledFile = '$tempDir/out-${runtime}.js';
-      var compiledShadowFile = '$tempDir/out_shadow.js';
       args = new List.from(args);
       String tempDir = createOutputDirectory(info.filePath, '');
+      var compiledFile = '$tempDir/out-${configuration['runtime']}.js';
+      var compiledShadowFile = '$tempDir/out_shadow.js';
       args.add('--out=$compiledFile');
 
        List<Command> commands =
            <Command>[new CompilationCommand(compiledFile,
                                             compiledShadowFile,
                                             !useSdk,
                                             dart2JsBootstrapDependencies,
                                             compilerPath,
                                             args)];
       if (info.hasCompileError) {
         // Do not attempt to run the compiled result. A compilation
         // error should be reported by the compilation command.
       } else if (configuration['runtime'] == 'd8') {
-        commands.add(new Command(d8FileName, ['$tempDir/out.js']));
+        commands.add(new Command(d8FileName, [compiledFile]));
       } else if (configuration['runtime'] == 'jsshell') {
-        commands.add(new Command(jsShellFileName, ['$tempDir/out.js']));
+        commands.add(new Command(jsShellFileName, [compiledFile]));
       }
       return commands;
 
     case 'dart2dart':
-      var compiledFile = '$tempDir/out-${runtime}.dart';
-      var compiledShadowFile = '$tempDir/out_shadow.dart';
       args = new List.from(args);
       args.add('--output-type=dart');
       String tempDir = createOutputDirectory(info.filePath, '');
+      var compiledFile = '$tempDir/out-${configuration['runtime']}.dart';
+      var compiledShadowFile = '$tempDir/out_shadow.dart';
       args.add('--out=$tempDir/out.dart');
 
       List<Command> commands =
           <Command>[new CompilationCommand(compiledFile,
                                            compiledShadowFile,
                                            !useSdk,
                                            dart2JsBootstrapDependencies,
                                            compilerPath,
                                            args)];
       if (info.hasCompileError) {
@@ skipping 1187 matching lines @@
  * $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
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
    }
 }