# HG changeset patch
# User t_mrc-ct@users.sourceforge.jp
# Date 1382175798 -32400
# Branch GECKO2470_2014071714_RELBRANCH
# Node ID 2526e83fb6a796eab9b8dd978c8806936871dd61
# Parent  379ef5e14e5333b07150e52ccd752584baf14b52
xpcshell-tests support patch

diff --git a/build/automationutils.py b/build/automationutils.py
--- a/build/automationutils.py
+++ b/build/automationutils.py
@@ -336,12 +336,13 @@
 def wrapCommand(cmd):
   """
   If running on OS X 10.5 or older, wrap |cmd| so that it will
   be executed as an i386 binary, in case it's a 32-bit/64-bit universal
   binary.
   """
   if platform.system() == "Darwin" and \
      hasattr(platform, 'mac_ver') and \
+     platform.processor() != 'powerpc' and \
      platform.mac_ver()[0][:4] < '10.6':
     return ["arch", "-arch", "i386"] + cmd
   # otherwise just execute the command normally
   return cmd
diff --git a/dom/plugins/test/moz.build b/dom/plugins/test/moz.build
--- a/dom/plugins/test/moz.build
+++ b/dom/plugins/test/moz.build
@@ -1,14 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['testplugin']
+#DIRS += ['testplugin']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'cocoa', 'windows'):
     TEST_DIRS += ['mochitest']
 
 MODULE = 'test_plugin'
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/media/webrtc/signaling/test/Makefile.in b/media/webrtc/signaling/test/Makefile.in
--- a/media/webrtc/signaling/test/Makefile.in
+++ b/media/webrtc/signaling/test/Makefile.in
@@ -92,21 +92,21 @@
 ifeq ($(OS_TARGET),Darwin)
 LIBS += \
   -framework AudioToolbox \
   -framework AudioUnit \
   -framework Carbon \
   -framework CoreAudio \
   -framework OpenGL \
   -framework QTKit \
+  -framework QuickTime \
   -framework QuartzCore \
   -framework Security \
   -framework SystemConfiguration \
   -framework IOKit \
-  -F/System/Library/PrivateFrameworks -framework CoreUI \
   $(TK_LIBS) \
   $(NULL)
 endif
 
 ifeq ($(OS_TARGET),WINNT)
 LIBS += \
   $(DEPTH)/staticlib/components/$(LIB_PREFIX)windowsproxy.$(LIB_SUFFIX) \
   $(NULL)
diff --git a/testing/mozbase/mozrunner/mozrunner/runner.py b/testing/mozbase/mozrunner/mozrunner/runner.py
--- a/testing/mozbase/mozrunner/mozrunner/runner.py
+++ b/testing/mozbase/mozrunner/mozrunner/runner.py
@@ -224,16 +224,17 @@
 
     def _wrap_command(self, cmd):
         """
         If running on OS X 10.5 or older, wrap |cmd| so that it will
         be executed as an i386 binary, in case it's a 32-bit/64-bit universal
         binary.
         """
         if mozinfo.isMac and hasattr(platform, 'mac_ver') and \
+                               platform.processor() != 'powerpc' and \
                                platform.mac_ver()[0][:4] < '10.6':
             return ["arch", "-arch", "i386"] + cmd
         return cmd
 
     __del__ = cleanup
 
 
 class FirefoxRunner(Runner):
diff --git a/toolkit/components/ctypes/tests/jsctypes-test.h b/toolkit/components/ctypes/tests/jsctypes-test.h
--- a/toolkit/components/ctypes/tests/jsctypes-test.h
+++ b/toolkit/components/ctypes/tests/jsctypes-test.h
@@ -1,13 +1,15 @@
 /* -*-  Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include <sys/types.h>
+
 #include "nscore.h"
 #include "prtypes.h"
 #include "jsapi.h"
 
 #define EXPORT_CDECL(type)   NS_EXPORT type
 #define EXPORT_STDCALL(type) NS_EXPORT type NS_STDCALL
 
 NS_EXTERN_C
