Revert revisions 36163 and 36162

tests/standalone/io/skipping_dart2js_compilations_test.dart

 // Copyright (c) 2013, 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.
 
 /*
  * This test makes sure that the "skipping Dart2Js compilations if the output is
  * already up to date" feature does work as it should.
  * Therefore this test ensures that compilations are only skipped if the last
  * modified date of the output of a dart2js compilation is newer than
  *   - the the dart application to compile (including it's dependencies)
  *   - the dart2js snapshot
  * Furtheremore it ensure that a compilations is not skipped if any of the
  * necessary files could not be found (dart2js snapshots, previous dart2js
  * output (+deps file), dart application)
  */
 
 import 'package:expect/expect.dart';
 import 'package:path/path.dart';
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 import '../../../tools/testing/dart/test_suite.dart' as suite;
 import '../../../tools/testing/dart/test_runner.dart' as runner;
 import '../../../tools/testing/dart/test_options.dart' as options;
 import '../../../tools/testing/dart/status_file_parser.dart' as status;
 import '../../../tools/testing/dart/utils.dart';
 
 /**
  * This class is reponsible for setting up the files necessary for this test
  * as well as touching a file.
  */
 class FileUtils {
   Directory tempDir;
   File testJs;
   File testJsDeps;
   File testDart;
   File testSnapshot;
-  File testCachedOutput;
 
   FileUtils({bool createJs,
              bool createJsDeps,
              bool createDart,
-             bool createSnapshot,
-             bool createCachedOutput}) {
+             bool createSnapshot}) {
     tempDir = Directory.systemTemp
                        .createTempSync('dart_skipping_dart2js_compilations');
     if (createJs) {
       testJs = _createFile(testJsFilePath);
       _writeToFile(testJs, "test.js content");
     }
     if (createSnapshot) {
       testSnapshot = _createFile(testSnapshotFilePath);
       _writeToFile(testSnapshot, "dart2js snapshot");
     }
     if (createDart) {
       testDart = _createFile(testDartFilePath);
       _writeToFile(testDart, "dart code");
     }
     if (createJsDeps) {
       testJsDeps = _createFile(testJsDepsFilePath);
       var path = suite.TestUtils.absolutePath(new Path(tempDir.path))
           .append("test.dart");
       _writeToFile(testJsDeps, "file://$path");
     }
-    if (createCachedOutput) {
-      testCachedOutput = _createFile(testCachedOutputPath);
-      var content =  JSON.encode({
-          'stdout': [],
-          'stderr': [],
-          'exitCode': 0,
-          'timedOut': false
-        });
-      _writeToFile(testCachedOutput, content);
-    }
-
   }
 
   void cleanup() {
     if (testJs != null) testJs.deleteSync();
     if (testJsDeps != null) testJsDeps.deleteSync();
     if (testDart != null) testDart.deleteSync();
     if (testSnapshot != null) testSnapshot.deleteSync();
-    if (testCachedOutput != null) testCachedOutput.deleteSync();
 
-    // If the script did run, it created this file, so we need to delete it
-    // We also need to delete the cached output which will always be there if
-    // we ran.
+    // if the script did run, it created this file, so we need to delete it
     File file = new File(scriptOutputPath.toNativePath());
     if (file.existsSync()) {
       file.deleteSync();
     }
-    File cacheFile = new File(testCachedOutputPath.toNativePath());
-    if (cacheFile.existsSync()) {
-      cacheFile.deleteSync();
-    }
 
     tempDir.deleteSync();
   }
 
   Path get scriptOutputPath {
     return suite.TestUtils.absolutePath(new Path(tempDir.path)
         .append('created_if_command_did_run.txt'));
   }
 
   Path get testDartFilePath {
     return suite.TestUtils.absolutePath(new Path(tempDir.path)
         .append('test.dart'));
   }
 
   Path get testJsFilePath {
     return suite.TestUtils.absolutePath(new Path(tempDir.path)
         .append('test.js'));
   }
 
   Path get testJsDepsFilePath {
     return suite.TestUtils.absolutePath(new Path(tempDir.path)
         .append('test.js.deps'));
   }
 
-  Path get testCachedOutputPath {
-    return suite.TestUtils.absolutePath(new Path(tempDir.path)
-        .append('test.js.cached_output'));
-  }
-
   Path get testSnapshotFilePath {
     return suite.TestUtils.absolutePath(new Path(tempDir.path)
         .append('test_dart2js.snapshot'));
   }
 
   void touchFile(File file) {
     _writeToFile(file, _readFile(file));
   }
 
   void _writeToFile(File file, String content) {
@@ skipping 18 matching lines @@
 
 class CommandCompletedHandler {
   FileUtils fileUtils;
   DateTime _expectedTimestamp;
   bool _shouldHaveRun;
 
   CommandCompletedHandler(FileUtils this.fileUtils, bool this._shouldHaveRun);
 
   void processCompletedTest(runner.CommandOutput output) {
     Expect.isTrue(output.exitCode == 0);
-    if (output.stderr.length > 0)
-      print(output.stderr);
     Expect.isTrue(output.stderr.length == 0);
-    Expect.isTrue(new File(fileUtils.testCachedOutputPath.toNativePath())
-        .existsSync());
     if (_shouldHaveRun) {
       Expect.isTrue(output.stdout.length == 0);
       Expect.isTrue(new File(fileUtils.scriptOutputPath.toNativePath())
           .existsSync());
     } else {
       Expect.isFalse(new File(fileUtils.scriptOutputPath.toNativePath())
           .existsSync());
     }
   }
 }
@@ skipping 12 matching lines @@
       false,
       bootstrapDeps,
       executable,
       arguments, {});
 }
 
 void main() {
   var fs_noTestJs = new FileUtils(createJs: false,
                                   createJsDeps: true,
                                   createDart: true,
-                                  createSnapshot: true,
-                                  createCachedOutput: false);
+                                  createSnapshot: true);
   var fs_noTestJsDeps = new FileUtils(createJs: true,
                                       createJsDeps: false,
                                       createDart: true,
-                                      createSnapshot: true,
-                                      createCachedOutput: true);
+                                      createSnapshot: true);
   var fs_noTestDart = new FileUtils(createJs: true,
                                     createJsDeps: true,
                                     createDart: false,
-                                    createSnapshot: true,
-                                    createCachedOutput: true);
+                                    createSnapshot: true);
   var fs_noTestSnapshot = new FileUtils(createJs: true,
                                         createJsDeps: true,
                                         createDart: true,
-                                        createSnapshot: false,
-                                        createCachedOutput: true);
+                                        createSnapshot: false);
   var fs_notUpToDate_snapshot = new FileUtils(createJs: true,
                                               createJsDeps: true,
                                               createDart: true,
-                                              createSnapshot: true,
-                                              createCachedOutput: true);
+                                              createSnapshot: true);
   var fs_notUpToDate_dart = new FileUtils(createJs: true,
                                           createJsDeps: true,
                                           createDart: true,
-                                          createSnapshot: true,
-                                          createCachedOutput: true);
+                                          createSnapshot: true);
   var fs_upToDate = new FileUtils(createJs: true,
                                   createJsDeps: true,
                                   createDart: true,
-                                  createSnapshot: true,
-                                  createCachedOutput: true);
+                                  createSnapshot: true);
   void cleanup() {
     fs_noTestJs.cleanup();
     fs_noTestJsDeps.cleanup();
     fs_noTestDart.cleanup();
     fs_noTestSnapshot.cleanup();
     fs_notUpToDate_snapshot.cleanup();
     fs_notUpToDate_dart.cleanup();
     fs_upToDate.cleanup();
   }
 
@@ skipping 31 matching lines @@
       cleanup();
       throw error;
     }).then((_) {
       cleanup();
     });
   }
   // We need to wait some time to make sure that the files we 'touch' get a
   // bigger timestamp than the old ones
   new Timer(new Duration(seconds: 1), touchFilesAndRunTests);
 }