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

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

Issue 176883023: Revert "Dart2js testing: Add prefix files when running dart2js output on d8 or jsshell." (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 9 months 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 | « sdk/lib/_internal/lib/preambles/jsshell.js ('k') | tools/testing/dart/runtime_configuration.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/testing/dart/compiler_configuration.dart
diff --git a/tools/testing/dart/compiler_configuration.dart b/tools/testing/dart/compiler_configuration.dart
index 891a33bcf4b8e22fb38755613b631fa55ac126cf..abe30edf891a2f69a6b255c832b1807be4fff949 100644
--- a/tools/testing/dart/compiler_configuration.dart
+++ b/tools/testing/dart/compiler_configuration.dart
@@ -16,8 +16,7 @@ import 'test_runner.dart' show
CompilationCommand;
import 'test_suite.dart' show
- TestInformation,
- TestUtils;
+ TestInformation;
/// Grouping of a command with its expected result.
class CommandArtifact {
@@ -125,7 +124,6 @@ abstract class CompilerConfiguration {
List<String> computeRuntimeArguments(
RuntimeConfiguration runtimeConfiguration,
- String buildDir,
TestInformation info,
List<String> vmOptions,
List<String> sharedOptions,
@@ -150,7 +148,6 @@ class NoneCompilerConfiguration extends CompilerConfiguration {
List<String> computeRuntimeArguments(
RuntimeConfiguration runtimeConfiguration,
- String buildDir,
TestInformation info,
List<String> vmOptions,
List<String> sharedOptions,
@@ -179,7 +176,7 @@ class Dart2xCompilerConfiguration extends CompilerConfiguration {
isHostChecked: isHostChecked, useSdk: useSdk);
String computeCompilerPath(String buildDir) {
- var prefix = 'sdk/bin';
+ var prefix = 'sdk/bin/';
String suffix = executableScriptSuffix;
if (isHostChecked) {
// The script dart2js_developer is not included in the
@@ -265,23 +262,6 @@ class Dart2jsCompilerConfiguration extends Dart2xCompilerConfiguration {
isCsp ? cspOutput : normalOutput,
'application/javascript');
}
-
- List<String> computeRuntimeArguments(
- RuntimeConfiguration runtimeConfiguration,
- String buildDir,
- TestInformation info,
- List<String> vmOptions,
- List<String> sharedOptions,
- List<String> originalArguments,
- CommandArtifact artifact) {
- Uri sdk = useSdk ?
- nativeDirectoryToUri(buildDir).resolve('dart-sdk/') :
- nativeDirectoryToUri(TestUtils.dartDir().toNativePath())
- .resolve('sdk/');
- Uri preambleDir = sdk.resolve('lib/_internal/lib/preambles/');
- return runtimeConfiguration.dart2jsPreambles(preambleDir)
- ..add(artifact.filename);
- }
}
/// Configuration for dart2dart compiler.
@@ -318,7 +298,6 @@ class Dart2dartCompilerConfiguration extends Dart2xCompilerConfiguration {
List<String> computeRuntimeArguments(
RuntimeConfiguration runtimeConfiguration,
- String buildDir,
TestInformation info,
List<String> vmOptions,
List<String> sharedOptions,
@@ -373,7 +352,6 @@ class AnalyzerCompilerConfiguration extends CompilerConfiguration {
List<String> computeRuntimeArguments(
RuntimeConfiguration runtimeConfiguration,
- String buildDir,
TestInformation info,
List<String> vmOptions,
List<String> sharedOptions,
« no previous file with comments | « sdk/lib/_internal/lib/preambles/jsshell.js ('k') | tools/testing/dart/runtime_configuration.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698