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

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

Issue 2640063002: Fix android precompilation builders after testing script refactoring (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | 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 bb10b16bbd189d451efecab70553ae4fed2dcaab..77b639c97c6b68b9a697fb14799936ffd7cb1d35 100644
--- a/tools/testing/dart/compiler_configuration.dart
+++ b/tools/testing/dart/compiler_configuration.dart
@@ -12,6 +12,8 @@ import 'test_runner.dart' show Command, CommandBuilder, CompilationCommand;
import 'test_suite.dart' show TestInformation, TestUtils;
+import 'runtime_configuration.dart' show DartPrecompiledAdbRuntimeConfiguration;
+
/// Grouping of a command with its expected result.
class CommandArtifact {
final List<Command> commands;
@@ -735,7 +737,13 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
var newOriginalArguments = new List<String>.from(originalArguments);
for (var i = 0; i < newOriginalArguments .length; i++) {
if (newOriginalArguments[i].endsWith(".dart")) {
- newOriginalArguments[i] = "${artifact.filename}/out.aotsnapshot";
+ var dir = artifact.filename;
+ if (runtimeConfiguration is DartPrecompiledAdbRuntimeConfiguration) {
+ // On android the precompiled snapshot will be pushed to a different
+ // directory on the device, use that one instead.
+ dir = DartPrecompiledAdbRuntimeConfiguration.DeviceTestDir;
+ }
+ newOriginalArguments[i] = "$dir/out.aotsnapshot";
}
}
return args
« no previous file with comments | « no previous file | tools/testing/dart/runtime_configuration.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698