Revert "Buildbot: Change --copy-crashdumps to do the actual archiving to CloudStorage."

tools/testing/dart/test_progress.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.
 
 library test_progress;
 
 import "dart:async";
 import "dart:io";
 import "dart:io" as io;
 import "dart:convert" show JSON;
@@ skipping 298 matching lines @@
   void _writeTestOutcomeRecord(Map record) {
     if (_sink == null) {
       _sink = new File(TestUtils.testOutcomeFileName())
           .openWrite(mode: FileMode.APPEND);
     }
     _sink.write("${JSON.encode(record)}\n");
   }
 }
 
 class UnexpectedCrashDumpArchiver extends EventListener {
-  final archivedBinaries = new Set<String>();
-
   void done(TestCase test) {
     if (test.unexpectedOutput && test.result == Expectation.CRASH) {
-      final name = "core.${test.lastCommandOutput.pid}";
-      final file = new File(name);
-      final exists = file.existsSync();
-      if (exists) {
-        // We have a coredump for the process. This coredump will be archived by
-        // CoreDumpArchiver (see tools/utils.py). For debugging purposes we
-        // need to archive the crashed binary as well. To simplify the
-        // archiving code we simply copy binaries into current folder next to
-        // core dumps and name them `core.${mode}_${arch}_${binary_name}`.
-        final binName = test.lastCommandExecuted.executable;
-        final binFile = new File(binName);
-        final binBaseName = new Path(binName).filename;
-        if (archivedBinaries.contains(binBaseName)) {
-          return;
-        }
-
+      var name = "core.dart.${test.lastCommandOutput.pid}";
+      var file = new File(name);
+      if (file.existsSync()) {
+        // Find the binary - we assume this is the first part of the command
+        var binName = test.lastCommandExecuted.toString().split(' ').first;
+        var binFile = new File(binName);
+        var binBaseName = new Path(binName).filename;
         if (binFile.existsSync()) {
-          final mode = test.configuration['mode'];
-          final arch = test.configuration['arch'];
-          TestUtils.copyFile(new Path(binName),
-              new Path("core.${mode}_${arch}_${binBaseName}"));
-          archivedBinaries.add(binBaseName);
+          var tmpPath = new Path(Directory.systemTemp.path);
+          var dir = new Path(TestUtils
+              .mkdirRecursive(
+                  tmpPath, new Path('coredump_${test.lastCommandOutput.pid}'))
+              .path);
+          TestUtils.copyFile(new Path(name), dir.append(name));
+          TestUtils.copyFile(new Path(binName), dir.append(binBaseName));
+          print("\nCopied core dump and binary for unexpected crash to: "
+              "$dir");
         }
       }
     }
   }
 }
 
 class SummaryPrinter extends EventListener {
   final bool jsonOnly;
 
   SummaryPrinter({bool jsonOnly})
@@ skipping 342 matching lines @@
       return new VerboseProgressIndicator(startTime);
     case 'status':
       return new ProgressIndicator(startTime);
     case 'buildbot':
       return new BuildbotProgressIndicator(startTime);
     default:
       assert(false);
       return null;
   }
 }