Deprecate automatic generation of precompiled.js.

tools/testing/dart/test_suite.dart

 // Copyright (c) 2012, 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.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 325 matching lines @@
   }
 
   /**
    * Create a directories for generated assets (tests, html files,
    * pubspec checkouts ...).
    */
 
   String createOutputDirectory(Path testPath, String optionsName) {
     var checked = configuration['checked'] ? '-checked' : '';
     var minified = configuration['minified'] ? '-minified' : '';
     var csp = configuration['csp'] ? '-csp' : '';

[ricow1, 2014/04/01 10:37:58]

there is no need to add this here now right?

[Johnni Winther, 2014/04/01 13:52:35]

Apparently not.

     var sdk = configuration['use_sdk'] ? '-sdk' : '';
     var packages = configuration['use_public_packages']
         ? '-public_packages' : '';
     var dirName = "${configuration['compiler']}-${configuration['runtime']}"
                   "$checked$minified$csp$packages$sdk";
     return createGeneratedTestDirectoryHelper(
         "tests", dirName, testPath, optionsName);
   }
 
   String createCompilationOutputDirectory(Path testPath) {
     var checked = configuration['checked'] ? '-checked' : '';
     var minified = configuration['minified'] ? '-minified' : '';
+    var csp = configuration['csp'] ? '-csp' : '';
     var sdk = configuration['use_sdk'] ? '-sdk' : '';
     var packages = configuration['use_public_packages']
         ? '-public_packages' : '';
-    var dirName = "${configuration['compiler']}$checked$minified$packages$sdk";
+    var dirName = "${configuration['compiler']}"
+                  "$checked$minified$csp$packages$sdk";
     return createGeneratedTestDirectoryHelper(
         "compilations", dirName, testPath, "");
   }
 
   String createPubspecCheckoutDirectory(Path directoryOfPubspecYaml) {
     var relativeDir = directoryOfPubspecYaml.relativeTo(TestUtils.dartDir());
     var sdk = configuration['use_sdk'] ? '-sdk' : '';
     var pkg = configuration['use_public_packages']
         ? 'public_packages' : 'repo_packages';
     return createGeneratedTestDirectoryHelper(
@@ skipping 771 matching lines @@
           optionsName = vmOptions.join('-').replaceAll('-','')
                                            .replaceAll('=','')
                                            .replaceAll('/','');
       }
       final String compilationTempDir =
           createCompilationOutputDirectory(info.filePath);
       final String tempDir = createOutputDirectory(info.filePath, optionsName);
 
       String dartWrapperFilename = '$tempDir/test.dart';
       String compiledDartWrapperFilename = '$compilationTempDir/test.js';
-      String precompiledDartWrapperFilename =
-          '$compilationTempDir/test.precompiled.js';
 
       String content = null;
       Path dir = filePath.directoryPath;
       String nameNoExt = filePath.filenameWithoutExtension;
 
       Path pngPath = dir.append('$nameNoExt.png');
       Path txtPath = dir.append('$nameNoExt.txt');
       String customHtmlPath = dir.append('$nameNoExt.html').toNativePath();
       File customHtml = new File(customHtmlPath);
 
@@ skipping 28 matching lines @@
           var htmlContents = customHtml.readAsStringSync();
           if (compiler == 'none') {
             htmlContents = htmlContents.replaceAll('%TEST_SCRIPTS%',
               '<script type="application/dart" '
               'src="${_createUrlPathFromFile(filePath)}"></script>\n'
               '<script type="text/javascript" '
                   'src="/packages/browser/dart.js"></script>');
           } else {
             compiledDartWrapperFilename = '$tempDir/$nameNoExt.js';
             var jsFile = '$nameNoExt.js';
-            if (configuration['csp']) {
-              jsFile = '$nameNoExt.precompiled.js';
-            }
             htmlContents = htmlContents.replaceAll('%TEST_SCRIPTS%',
               '<script src="$jsFile"></script>');
           }
           new File(htmlPath).writeAsStringSync(htmlContents);
         }
       } else {
         htmlPath = '$tempDir/test.html';
         if (configuration['compiler'] != 'dart2js') {
           // test.dart will import the dart test.
           _createWrapperFile(dartWrapperFilename, filePath);
         } else {
           dartWrapperFilename = filename;
         }
 
         // Create the HTML file for the test.
         RandomAccessFile htmlTest =
             new File(htmlPath).openSync(mode: FileMode.WRITE);
 
         String scriptPath = dartWrapperFilename;
         if (compiler != 'none') {
           scriptPath = compiledDartWrapperFilename;
-          if (configuration['csp']) {
-            scriptPath = precompiledDartWrapperFilename;
-          }
         }
         scriptPath = _createUrlPathFromFile(new Path(scriptPath));
 
         content =
             getHtmlContents(filename, scriptType, new Path("$scriptPath"));
         htmlTest.writeStringSync(content);
         htmlTest.closeSync();
       }
 
       if (compiler != 'none') {
@@ skipping 87 matching lines @@
       String compiler, String dir, vmOptions, optionsFromFile) {
     assert (['dart2js', 'dart2dart'].contains(compiler));
     String executable = compilerPath;
     List<String> args = TestUtils.standardOptions(configuration);
     String packageRoot =
       packageRootArgument(optionsFromFile['packageRoot']);
     if (packageRoot != null) {
       args.add(packageRoot);
     }
     args.add('--out=$outputFile');
+    if (configuration['csp']) args.add('--csp');
     args.add(inputFile);
     args.addAll(optionsFromFile['sharedOptions']);
     if (executable.endsWith('.dart')) {
       // Run the compiler script via the Dart VM.
       args.insert(0, executable);
       executable = dartVmBinaryFileName;
     }
     return CommandBuilder.instance.getCompilationCommand(
         compiler, outputFile, !useSdk,
         dart2JsBootstrapDependencies, compilerPath, args, environmentOverrides);
@@ skipping 857 matching lines @@
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
    }
 }