| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 /** | 5 /** |
| 6 * Classes and methods for enumerating and preparing tests. | 6 * Classes and methods for enumerating and preparing tests. |
| 7 * | 7 * |
| 8 * This library includes: | 8 * This library includes: |
| 9 * | 9 * |
| 10 * - Creating tests by listing all the Dart files in certain directories, | 10 * - Creating tests by listing all the Dart files in certain directories, |
| (...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 583 | 583 |
| 584 /** Helper to create a compilation command for a single input file. */ | 584 /** Helper to create a compilation command for a single input file. */ |
| 585 Command _compileCommand(String inputFile, String outputFile, | 585 Command _compileCommand(String inputFile, String outputFile, |
| 586 String compiler, String dir, var vmOptions) { | 586 String compiler, String dir, var vmOptions) { |
| 587 String executable = TestUtils.compilerPath(configuration); | 587 String executable = TestUtils.compilerPath(configuration); |
| 588 List<String> args = TestUtils.standardOptions(configuration); | 588 List<String> args = TestUtils.standardOptions(configuration); |
| 589 switch (compiler) { | 589 switch (compiler) { |
| 590 case 'frog': | 590 case 'frog': |
| 591 case 'frogsh': | 591 case 'frogsh': |
| 592 case 'dart2js': | 592 case 'dart2js': |
| 593 String libdir = '$dartDir/frog/lib'; | 593 String libdir = configuration['froglib']; |
| 594 if (libdir == '') { |
| 595 libdir = '$dartDir/frog/lib'; |
| 596 } |
| 594 args.addAll(['--libdir=$libdir', | 597 args.addAll(['--libdir=$libdir', |
| 595 '--compile-only', | 598 '--compile-only', |
| 596 '--out=$outputFile']); | 599 '--out=$outputFile']); |
| 597 args.addAll(vmOptions); | 600 args.addAll(vmOptions); |
| 598 args.add(inputFile); | 601 args.add(inputFile); |
| 599 break; | 602 break; |
| 600 default: | 603 default: |
| 601 Expect.fail('unimplemented compiler $compiler'); | 604 Expect.fail('unimplemented compiler $compiler'); |
| 602 } | 605 } |
| 603 return new Command(executable, args); | 606 return new Command(executable, args); |
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1118 if (!(new File(name)).existsSync() && !configuration['list']) { | 1121 if (!(new File(name)).existsSync() && !configuration['list']) { |
| 1119 throw "Executable '$name' does not exist"; | 1122 throw "Executable '$name' does not exist"; |
| 1120 } | 1123 } |
| 1121 return name; | 1124 return name; |
| 1122 } | 1125 } |
| 1123 | 1126 |
| 1124 static String compilerPath(Map configuration) { | 1127 static String compilerPath(Map configuration) { |
| 1125 if (configuration['compiler'] == 'none') { | 1128 if (configuration['compiler'] == 'none') { |
| 1126 return null; // No separate compiler for dartium tests. | 1129 return null; // No separate compiler for dartium tests. |
| 1127 } | 1130 } |
| 1128 var name = '${buildDir(configuration)}/${compilerName(configuration)}'; | 1131 var name = configuration['frog']; |
| 1132 if (name == '') { |
| 1133 name = '${buildDir(configuration)}/${compilerName(configuration)}'; |
| 1134 } |
| 1129 if (!(new File(name)).existsSync() && !configuration['list']) { | 1135 if (!(new File(name)).existsSync() && !configuration['list']) { |
| 1130 throw "Executable '$name' does not exist"; | 1136 throw "Executable '$name' does not exist"; |
| 1131 } | 1137 } |
| 1132 return name; | 1138 return name; |
| 1133 } | 1139 } |
| 1134 | 1140 |
| 1135 static String outputDir(Map configuration) { | 1141 static String outputDir(Map configuration) { |
| 1136 var result = ''; | 1142 var result = ''; |
| 1137 var system = configuration['system']; | 1143 var system = configuration['system']; |
| 1138 if (system == 'linux') { | 1144 if (system == 'linux') { |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1228 * $noCrash tests are expected to be flaky but not crash | 1234 * $noCrash tests are expected to be flaky but not crash |
| 1229 * $pass tests are expected to pass | 1235 * $pass tests are expected to pass |
| 1230 * $failOk tests are expected to fail that we won't fix | 1236 * $failOk tests are expected to fail that we won't fix |
| 1231 * $fail tests are expected to fail that we should fix | 1237 * $fail tests are expected to fail that we should fix |
| 1232 * $crash tests are expected to crash that we should fix | 1238 * $crash tests are expected to crash that we should fix |
| 1233 * $timeout tests are allowed to timeout | 1239 * $timeout tests are allowed to timeout |
| 1234 """; | 1240 """; |
| 1235 print(report); | 1241 print(report); |
| 1236 } | 1242 } |
| 1237 } | 1243 } |
| OLD | NEW |