Revert revisions 36163 and 36162

tests/standalone/io/skipping_dart2js_compilations_test.dart

Index: tests/standalone/io/skipping_dart2js_compilations_test.dart
===================================================================
--- tests/standalone/io/skipping_dart2js_compilations_test.dart	(revision 36164)
+++ tests/standalone/io/skipping_dart2js_compilations_test.dart	(working copy)
@@ -17,7 +17,6 @@
 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;
@@ -35,13 +34,11 @@
   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) {
@@ -62,17 +59,6 @@
           .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() {
@@ -80,19 +66,12 @@
     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();
   }
@@ -117,11 +96,6 @@
         .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'));
@@ -160,11 +134,7 @@
 
   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())
@@ -197,38 +167,31 @@
   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();