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

Unified Diff: dart/tools/testing/dart/test_suite.dart

Issue 11414055: Revert "Allow tests to specify a package root." (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dart/tools/make_links.py ('k') | dart/tools/testing/drt-trampoline.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/tools/testing/dart/test_suite.dart
diff --git a/dart/tools/testing/dart/test_suite.dart b/dart/tools/testing/dart/test_suite.dart
index 0a3265ac1b480e8a75ce4052b5e9f1c5212716d6..84fd882b2df7fd3a2a5c5304f2ff6009ee9d9b3e 100644
--- a/dart/tools/testing/dart/test_suite.dart
+++ b/dart/tools/testing/dart/test_suite.dart
@@ -105,7 +105,11 @@ abstract class TestSuite {
/**
* The output directory for this suite's configuration.
*/
- String get buildDir => TestUtils.buildDir(configuration);
+ String get buildDir {
+ var mode = (configuration['mode'] == 'debug') ? 'Debug' : 'Release';
+ var arch = configuration['arch'].toUpperCase();
+ return "${TestUtils.outputDir(configuration)}$mode$arch";
+ }
/**
* The path to the compiler for this suite's configuration. Returns `null` if
@@ -927,13 +931,6 @@ class StandardTestSuite extends TestSuite {
dumpRenderTreeFilename,
'--no-timeout'
];
- if (compiler == 'none') {
- String packageRoot =
- packageRootArgument(optionsFromFile['packageRoot']);
- if (packageRoot != null) {
- args.add(packageRoot);
- }
- }
if (runtime == 'drt' &&
(compiler == 'none' || compiler == 'dart2dart')) {
var dartFlags = ['--ignore-unrecognized-flags'];
@@ -1099,11 +1096,6 @@ class StandardTestSuite extends TestSuite {
List<String> commonArgumentsFromFile(Path filePath, Map optionsFromFile) {
List args = TestUtils.standardOptions(configuration);
-
- String packageRoot = packageRootArgument(optionsFromFile['packageRoot']);
- if (packageRoot != null) {
- args.add(packageRoot);
- }
args.addAll(additionalOptions(filePath));
if (configuration['compiler'] == 'dartc') {
args.add('--error_format');
@@ -1131,15 +1123,6 @@ class StandardTestSuite extends TestSuite {
return args;
}
- String packageRootArgument(String packageRootFromFile) {
- if (packageRootFromFile == "none") return null;
- String packageRoot = packageRootFromFile;
- if (packageRootFromFile == null) {
- packageRoot = "$buildDir/packages/";
- }
- return "--package-root=$packageRoot";
- }
-
/**
* Special options for individual tests are currently specified in various
* ways: with comments directly in test files, by using certain imports, or by
@@ -1200,7 +1183,6 @@ class StandardTestSuite extends TestSuite {
RegExp testOptionsRegExp = new RegExp(r"// VMOptions=(.*)");
RegExp dartOptionsRegExp = new RegExp(r"// DartOptions=(.*)");
RegExp otherScriptsRegExp = new RegExp(r"// OtherScripts=(.*)");
- RegExp packageRootRegExp = new RegExp(r"// PackageRoot=(.*)");
RegExp multiTestRegExp = new RegExp(r"/// [0-9][0-9]:(.*)");
RegExp multiHtmlTestRegExp =
new RegExp(r"useHtmlIndividualConfiguration()");
@@ -1235,7 +1217,6 @@ class StandardTestSuite extends TestSuite {
// Find the options in the file.
List<List> result = new List<List>();
List<String> dartOptions;
- String packageRoot;
bool hasCompileError = contents.contains("@compile-error");
bool hasRuntimeError = contents.contains("@runtime-error");
bool isStaticClean = false;
@@ -1255,15 +1236,6 @@ class StandardTestSuite extends TestSuite {
dartOptions = match[1].split(' ').filter((e) => e != '');
}
- matches = packageRootRegExp.allMatches(contents);
- for (var match in matches) {
- if (packageRoot != null) {
- throw new Exception(
- 'More than one "// PackageRoot=" line in test $filePath');
- }
- packageRoot = match[1];
- }
-
matches = staticCleanRegExp.allMatches(contents);
for (var match in matches) {
if (isStaticClean) {
@@ -1312,7 +1284,6 @@ class StandardTestSuite extends TestSuite {
return { "vmOptions": result,
"dartOptions": dartOptions,
- "packageRoot": packageRoot,
"hasCompileError": hasCompileError,
"hasRuntimeError": hasRuntimeError,
"isStaticClean" : isStaticClean,
@@ -1608,11 +1579,6 @@ class TestUtils {
static bool isJsCommandLineRuntime(String runtime) =>
const ['d8', 'jsshell'].contains(runtime);
- static String buildDir(Map configuration) {
- var mode = (configuration['mode'] == 'debug') ? 'Debug' : 'Release';
- var arch = configuration['arch'].toUpperCase();
- return "${TestUtils.outputDir(configuration)}$mode$arch";
- }
}
class SummaryReport {
« no previous file with comments | « dart/tools/make_links.py ('k') | dart/tools/testing/drt-trampoline.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698