# HG changeset patch
# User t_mrc-ct@users.sourceforge.jp
# Date 1403425536 -32400
# Branch GECKO310b2_2014070404_RELBRANCH
# Node ID ff3464e2805a68bbdaed5cab13bc1fd3be783e3c
# Parent  22dd70ba3426b2c8657099ef7c18cc552a5b13e4
xpcshell-tests support patch

diff --git a/build/automationutils.py b/build/automationutils.py
--- a/build/automationutils.py
+++ b/build/automationutils.py
@@ -410,16 +410,17 @@
 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
 
 class KeyValueParseError(Exception):
   """error when parsing strings of serialized key-values"""
   def __init__(self, msg, errors=()):
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', 'testaddon']
+#DIRS += ['testplugin', 'testaddon']
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'cocoa', 'windows'):
     MOCHITEST_MANIFESTS += ['mochitest/mochitest.ini']
     MOCHITEST_CHROME_MANIFESTS += ['mochitest/chrome.ini']
 
diff --git a/media/webrtc/signaling/test/moz.build b/media/webrtc/signaling/test/moz.build
--- a/media/webrtc/signaling/test/moz.build
+++ b/media/webrtc/signaling/test/moz.build
@@ -71,20 +71,20 @@
     ]
     LDFLAGS += [
         '-framework AudioToolbox',
         '-framework AudioUnit',
         '-framework Carbon',
         '-framework CoreAudio',
         '-framework OpenGL',
         '-framework QTKit',
+        '-framework QuickTime',
         '-framework QuartzCore',
         '-framework Security',
         '-framework SystemConfiguration',
         '-framework IOKit',
-        '-F%s' % CONFIG['MACOS_PRIVATE_FRAMEWORKS_DIR'],
     ]
 
 if CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'):
     LOCAL_INCLUDES += [
         '/media/mtransport/third_party/nrappkit/src/port/darwin/include',
         '/media/mtransport/third_party/nrappkit/src/port/generic/include',
     ]
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,16 +1,18 @@
 /* -*-  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/. */
 
 #ifndef jsctypes_test_h
 #define jsctypes_test_h
 
+#include <sys/types.h>
+
 #include "nscore.h"
 #include "jspubtd.h"
 
 #define EXPORT_CDECL(type)   NS_EXPORT type
 #define EXPORT_STDCALL(type) NS_EXPORT type NS_STDCALL
 
 NS_EXTERN_C
 {
