Bug 555234: Enable OOPP for x86 OS X and don't export mochitests conditional on MOZ_IPC. r=bsmedberg,ted

2010-04-02 20:19:31 -05:00 · 2010-04-02 20:19:31 -05:00 · 9994fdbfbf
commit 9994fdbfbf
parent 9afe5059b5
8 changed files with 118 additions and 19 deletions
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@ -48,12 +48,13 @@
@BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
 #ifdef XP_MACOSX
@BINPATH@/XUL
+@BINPATH@/mozilla-runtime@BIN_SUFFIX@
 #else
@BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
-#endif
 #ifdef MOZ_IPC
@BINPATH@/mozilla-runtime@BIN_SUFFIX@
 #endif
+#endif
 #ifdef WINCE
@BINPATH@/mozce_shunt.dll
 #elifdef XP_WIN32
--- a/configure.in
+++ b/configure.in
@ -5485,9 +5485,6 @@ case "${target}" in
 powerpc-apple-darwin*)
    MOZ_IPC=
    ;;
-i386-apple-darwin*)
-    MOZ_IPC=
-    ;;
 *-wince*)
    MOZ_IPC=
    ;;
--- a/ipc/app/fake/Makefile.in
+++ b/ipc/app/fake/Makefile.in
@ -0,0 +1,46 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+SIMPLE_PROGRAMS	= mozilla-runtime
+
+include $(topsrcdir)/config/rules.mk
--- a/ipc/app/fake/mozilla-runtime.cpp
+++ b/ipc/app/fake/mozilla-runtime.cpp
@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: sw=4 ts=4 et :
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Fake Mozilla Plugin App.
+ *
+ * The Initial Developer of the Original Code is
+ *   Josh Aas <josh@mozilla.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <stdio.h>
+
+int main()
+{
+  printf ("All your process are belong to us.\n");
+  return 0;
+}
--- a/modules/plugin/test/mochitest/Makefile.in
+++ b/modules/plugin/test/mochitest/Makefile.in
@ -80,19 +80,14 @@ _MOCHITEST_FILES = \
  test_streamatclose.html \
  neverending.sjs \
  test_newstreamondestroy.html \
-  $(NULL)
-
-#  test_npruntime_npnsetexception.html \ Disabled for e10s
-
-ifdef MOZ_IPC
-_MOCHITEST_FILES += \
  test_crashing.html \
  test_crashing2.html \
  test_hanging.html \
  crashing_subpage.html \
  test_GCrace.html \
  $(NULL)
-endif
+
+#  test_npruntime_npnsetexception.html \ Disabled for e10s

 ifeq ($(OS_ARCH),WINNT)
 _MOCHITEST_FILES += \
@ -102,6 +97,8 @@ endif

 _MOCHICHROME_FILES = \
  test_bug479979.xul \
+  test_crash_notify.xul \
+  test_crash_notify_no_report.xul \
  test_npruntime.xul   \
  test_privatemode.xul \
  test_wmode.xul \
@ -119,13 +116,6 @@ _MOCHITEST_FILES += \
 		$(NULL)
 endif

-ifdef MOZ_IPC
-_MOCHICHROME_FILES += \
-  test_crash_notify.xul \
-  test_crash_notify_no_report.xul \
-  $(NULL)
-endif
-
 libs:: $(_MOCHICHROME_FILES)
 	$(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)

--- a/modules/plugin/test/mochitest/test_GCrace.html
+++ b/modules/plugin/test/mochitest/test_GCrace.html
@ -7,7 +7,7 @@
 	  src="/tests/SimpleTest/SimpleTest.js"></script>
  <link rel="stylesheet" type="text/css"
 	href="/tests/SimpleTest/test.css" />
-<body onload="setTimeout(checkGCRace, 1000)">
+<body onload="start()">
  <p id="display"></p>

  <embed id="p" type="application/x-test" wmode="window"></embed>
@ -15,6 +15,20 @@
  <script class="testbody" type="application/javascript">
    SimpleTest.waitForExplicitFinish();

+    function start() {
+      netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+      var prefs = Components.classes['@mozilla.org/preferences-service;1']
+        .getService(Components.interfaces.nsIPrefBranch);
+      if (!prefs.getBoolPref('dom.ipc.plugins.enabled')) {
+        ok(true, "Skipping this test when IPC plugins are not enabled.");
+        SimpleTest.finish();
+        return;
+      }
+      else {
+        setTimeout(checkGCRace, 1000);
+      }
+    }
+
    var nested = false;

    function cb(f) {
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@ -52,6 +52,7 @@ MAKEFILES_dom="
  ipc/chromium/Makefile
  ipc/glue/Makefile
  ipc/ipdl/Makefile
+  ipc/app/fake/Makefile
  dom/Makefile
  dom/public/coreEvents/Makefile
  dom/interfaces/base/Makefile
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@ -107,6 +107,11 @@ endif

 ifdef MOZ_IPC
 tier_platform_dirs += ipc
+else
+# Include fake mozilla-runtime so that unify has something to unify.
+ifeq ($(OS_ARCH)_$(TARGET_CPU),Darwin_powerpc)
+tier_platform_dirs += ipc/app/fake
+endif
 endif

 tier_platform_dirs += \