Simplify command line options for creating snapshots.

tools/testing/dart/compiler_configuration.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library compiler_configuration;
 
 import 'dart:io' show Platform;
 
 import 'runtime_configuration.dart' show RuntimeConfiguration;
 
@@ skipping 324 matching lines @@
   }
 
   CompilationCommand computeCompilationCommand(
       String tempDir,
       String buildDir,
       CommandBuilder commandBuilder,
       List arguments,
       Map<String, String> environmentOverrides) {
     var exec = "$buildDir/dart_bootstrap";
     var args = new List();
-    args.add("--gen-precompiled-snapshot=$tempDir");
+    args.add("--snapshot=$tempDir");
+    args.add("--snapshot-kind=app-aot");
     if (useBlobs) {
-      args.add("--use_blobs");
+      args.add("--use-blobs");
     }
     if (isAndroid && arch == 'arm') {
       args.add('--no-sim-use-hardfp');
     }
     args.addAll(arguments);
 
     return commandBuilder.getCompilationCommand('precompiler', tempDir, !useSdk,
         bootstrapDependencies(buildDir), exec, args, environmentOverrides);
   }
 
@@ skipping 10 matching lines @@
       shared = '-shared';
       libname = 'libprecompiled.so';
     } else if (Platform.isMacOS) {
       cc = 'clang';
       shared = '-dynamiclib';
       libname = 'libprecompiled.dylib';
     } else {
       throw "Platform not supported: ${Platform.operatingSystem}";
     }
     if (isAndroid) {
-      // TODO: If we're not using "--use_blobs" we need to use the arm cross
+      // TODO: If we're not using "--use-blobs" we need to use the arm cross
       // compiler instead of just 'gcc' for .
     }
 
     var cc_flags;
     if (arch == 'x64') {
       cc_flags = "-m64";
     } else if (arch == 'simarm64') {
       cc_flags = "-m64";
     } else if (arch == 'ia32') {
       cc_flags = "-m32";
     } else if (arch == 'simarm') {
       cc_flags = "-m32";
     } else if (arch == 'simmips') {
       cc_flags = "-m32";
     } else if (arch == 'arm') {
       cc_flags = null;
     } else if (arch == 'mips') {
       cc_flags = "-EL";
     } else {
       throw "Architecture not supported: $arch";
     }
 
     var exec = cc;
     var args = (cc_flags != null) ? [ shared, cc_flags ] : [ shared ];
     args.addAll([
       '-o',
       '$tempDir/$libname',
-      '$tempDir/precompiled.S'
+      '$tempDir/snapshot.S'
     ]);
 
     return commandBuilder.getCompilationCommand('assemble', tempDir, !useSdk,
         bootstrapDependencies(buildDir), exec, args, environmentOverrides);
   }
 
   // This step reduces the amount of space needed to run the precompilation
   // tests by 60%.
   CompilationCommand computeRemoveAssemblyCommand(
       String tempDir,
       String buildDir,
       CommandBuilder commandBuilder,
       List arguments,
       Map<String, String> environmentOverrides) {
     var exec = 'rm';
-    var args = ['$tempDir/precompiled.S'];
+    var args = ['$tempDir/snapshot.S'];
 
     return commandBuilder.getCompilationCommand(
         'remove_assembly',
         tempDir,
         !useSdk,
         bootstrapDependencies(buildDir),
         exec,
         args,
         environmentOverrides);
   }
@@ skipping 50 matching lines @@
     if (isChecked) multiplier *= 2;
     return multiplier;
   }
 
   CommandArtifact computeCompilationArtifact(
       String buildDir,
       String tempDir,
       CommandBuilder commandBuilder,
       List arguments,
       Map<String, String> environmentOverrides) {
-    String outputName = computeOutputName(tempDir);
     return new CommandArtifact(<Command>[
-      this.computeCompilationCommand(outputName, buildDir,
+      this.computeCompilationCommand(tempDir, buildDir,
           CommandBuilder.instance, arguments, environmentOverrides)
-    ], outputName, 'application/dart-snapshot');
-  }
-
-  String computeOutputName(String tempDir) {
-    var randName = TestUtils.getRandomNumber().toString();
-    return '$tempDir/test.$randName';
+    ], tempDir, 'application/dart-snapshot');
   }
 
   CompilationCommand computeCompilationCommand(
-      String outputName,
+      String tempDir,
       String buildDir,
       CommandBuilder commandBuilder,
       List arguments,
       Map<String, String> environmentOverrides) {
     var exec = "$buildDir/dart_bootstrap";
     var args = new List();
-    args.add("--full-snapshot-after-run=$outputName");
+    args.add("--snapshot=$tempDir");
+    args.add("--snapshot-kind=app-after-run");
     args.addAll(arguments);
 
     return commandBuilder.getCompilationCommand(
         'dart2snapshot',
-        outputName,
+        tempDir,
         !useSdk,
         bootstrapDependencies(buildDir),
         exec,
         args,
         environmentOverrides);
   }
 
   List<String> computeCompilerArguments(
       vmOptions, sharedOptions, originalArguments) {
     List<String> args = [];
@@ skipping 80 matching lines @@
       RuntimeConfiguration runtimeConfiguration,
       String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
     return <String>[];
   }
 }