Fix MinidumpGenerator::WriteExceptionStream for writing cross-architecture dumps

R=mark at http://breakpad.appspot.com/244001

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@747 4c0a9323-5329-0410-9bdc-e9ce6186880e

1 files changed, 2 insertions, 92 deletions

diff --git a/src/client/mac/tests/minidump_generator_test.cc b/src/client/mac/tests/minidump_generator_test.cc
index 68bc1de6..f9cf75af 100644
--- a/src/client/mac/tests/minidump_generator_test.cc
+++ b/src/client/mac/tests/minidump_generator_test.cc
@@ -33,11 +33,6 @@
 #ifndef MAC_OS_X_VERSION_10_6
 #define MAC_OS_X_VERSION_10_6 1060
 #endif
-#include <crt_externs.h>
-#include <mach-o/dyld.h>
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
-#include <spawn.h>
-#endif
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -47,6 +42,7 @@
 #include "breakpad_googletest_includes.h"
 #include "client/mac/handler/minidump_generator.h"
 #include "client/mac/tests/auto_tempdir.h"
+#include "client/mac/tests/spawn_child_process.h"
 #include "common/mac/MachIPC.h"
 #include "google_breakpad/processor/minidump.h"
 
@@ -75,38 +71,7 @@ using google_breakpad::MinidumpThread;
 using google_breakpad::MinidumpThreadList;
 using google_breakpad::ReceivePort;
 using testing::Test;
-
-const MDCPUArchitecture kNativeArchitecture =
-#if defined(__i386__)
-  MD_CPU_ARCHITECTURE_X86
-#elif defined(__x86_64__)
-  MD_CPU_ARCHITECTURE_AMD64
-#elif defined(__ppc__) || defined(__ppc64__)
-  MD_CPU_ARCHITECTURE_PPC
-#else
-#error "This test has not been ported to this CPU architecture."
-#endif
-  ;
-
-const u_int32_t kNativeContext =
-#if defined(__i386__)
-  MD_CONTEXT_X86
-#elif defined(__x86_64__)
-  MD_CONTEXT_AMD64
-#elif defined(__ppc__) || defined(__ppc64__)
-  MD_CONTEXT_PPC
-#else
-#error "This test has not been ported to this CPU architecture."
-#endif
-  ;
-
-static string GetExecutablePath() {
-  char self_path[PATH_MAX];
-  uint32_t size = sizeof(self_path);
-  if (_NSGetExecutablePath(self_path, &size) != 0)
-    return "";
-  return self_path;
-}
+using namespace google_breakpad_test;
 
 class MinidumpGeneratorTest : public Test {
  public:
@@ -260,65 +225,10 @@ TEST_F(MinidumpGeneratorTest, OutOfProcess) {
   EXPECT_EQ(GetExecutablePath(), main_module->code_file());
 }
 
-static string GetHelperPath() {
-  string helper_path(GetExecutablePath());
-  size_t pos = helper_path.rfind('/');
-  if (pos == string::npos)
-    return "";
-
-  helper_path.erase(pos + 1);
-  helper_path += "minidump_generator_test_helper";
-  return helper_path;
-}
-
 // This test fails on 10.5, but I don't have easy access to a 10.5 machine,
 // so it's simpler to just limit it to 10.6 for now.
 #if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6) && \
   (defined(__x86_64__) || defined(__i386__))
-static pid_t spawn_child_process(const char** argv) {
-  posix_spawnattr_t spawnattr;
-  if (posix_spawnattr_init(&spawnattr) != 0)
-    return (pid_t)-1;
-
-  cpu_type_t pref_cpu_types[2] = {
-#if defined(__x86_64__)
-    CPU_TYPE_X86,
-#elif defined(__i386__)
-    CPU_TYPE_X86_64,
-#endif
-    CPU_TYPE_ANY
-  };
-
-  // Set spawn attributes.
-  size_t attr_count = sizeof(pref_cpu_types) / sizeof(pref_cpu_types[0]);
-  size_t attr_ocount = 0;
-  if (posix_spawnattr_setbinpref_np(&spawnattr,
-                                    attr_count,
-                                    pref_cpu_types,
-                                    &attr_ocount) != 0 ||
-      attr_ocount != attr_count) {
-    posix_spawnattr_destroy(&spawnattr);
-    return (pid_t)-1;
-  }
-
-  // Create an argv array.
-  vector<char*> argv_v;
-  while (*argv) {
-    argv_v.push_back(strdup(*argv));
-    argv++;
-  }
-  argv_v.push_back(NULL);
-  pid_t new_pid = 0;
-  int result = posix_spawnp(&new_pid, argv_v[0], NULL, &spawnattr,
-                            &argv_v[0], *_NSGetEnviron());
-  posix_spawnattr_destroy(&spawnattr);
-  
-  for (unsigned i = 0; i < argv_v.size(); i++) {
-    free(argv_v[i]);
-  }
-
-  return result == 0 ? new_pid : -1;
-}
 
 TEST_F(MinidumpGeneratorTest, CrossArchitectureDump) {
   const int kTimeoutMs = 5000;