Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: tools/testing/dart/test_suite.dart

Issue 11358175: Do not generate multiple tests for vm options. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1124 matching lines...) Expand 10 before | Expand all | Expand 10 after
1135 "numStaticTypeAnnotations": numStaticTypeAnnotations, 1135 "numStaticTypeAnnotations": numStaticTypeAnnotations,
1136 "numCompileTimeAnnotations": numCompileTimeAnnotations }; 1136 "numCompileTimeAnnotations": numCompileTimeAnnotations };
1137 } 1137 }
1138 1138
1139 List<List<String>> getVmOptions(Map optionsFromFile) { 1139 List<List<String>> getVmOptions(Map optionsFromFile) {
1140 bool needsVmOptions = Contains(configuration['compiler'], 1140 bool needsVmOptions = Contains(configuration['compiler'],
1141 const ['none', 'dart2dart', 'dartc']) && 1141 const ['none', 'dart2dart', 'dartc']) &&
1142 Contains(configuration['runtime'], 1142 Contains(configuration['runtime'],
1143 const ['none', 'vm', 'drt', 'dartium']); 1143 const ['none', 'vm', 'drt', 'dartium']);
1144 if (!needsVmOptions) return [[]]; 1144 if (!needsVmOptions) return [[]];
1145 return optionsFromFile['vmOptions']; 1145 final vmOptions = optionsFromFile['vmOptions'];
1146 if (configuration['compiler'] != 'dart2dart') return vmOptions;
1147 // Temporary workaround for race in test suite: tests with different
1148 // vm options are still compiled into the same output file which
1149 // may lead to reads from empty files.
1150 return [vmOptions[0]];
1146 } 1151 }
1147 } 1152 }
1148 1153
1149 1154
1150 class DartcCompilationTestSuite extends StandardTestSuite { 1155 class DartcCompilationTestSuite extends StandardTestSuite {
1151 List<String> _testDirs; 1156 List<String> _testDirs;
1152 int activityCount = 0; 1157 int activityCount = 0;
1153 1158
1154 DartcCompilationTestSuite(Map configuration, 1159 DartcCompilationTestSuite(Map configuration,
1155 String suiteName, 1160 String suiteName,
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1571 * $pass tests are expected to pass 1576 * $pass tests are expected to pass
1572 * $failOk tests are expected to fail that we won't fix 1577 * $failOk tests are expected to fail that we won't fix
1573 * $fail tests are expected to fail that we should fix 1578 * $fail tests are expected to fail that we should fix
1574 * $crash tests are expected to crash that we should fix 1579 * $crash tests are expected to crash that we should fix
1575 * $timeout tests are allowed to timeout 1580 * $timeout tests are allowed to timeout
1576 * $compileErrorSkip tests are skipped on browsers due to compile-time error 1581 * $compileErrorSkip tests are skipped on browsers due to compile-time error
1577 """; 1582 """;
1578 print(report); 1583 print(report);
1579 } 1584 }
1580 } 1585 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698