Merge mozilla-central to tracemonkey. a=whatever

Makefile.in

@@ -148,7 +148,7 @@ endif
 ifeq ($(OS_ARCH),Darwin)
 # need to pass arch flags for universal builds
 ifdef UNIVERSAL_BINARY
-MAKE_SYM_STORE_ARGS := -c -a "ppc i386" --vcs-info
+MAKE_SYM_STORE_ARGS := -c -a "i386 x86_64" --vcs-info
 MAKE_SYM_STORE_PATH := $(DIST)/universal
 else
 MAKE_SYM_STORE_ARGS := -c -a $(OS_TEST) --vcs-info

build/macosx/universal/mozconfig

@@ -1,7 +1,7 @@
-# ppc/i386 Universal Build mozconfig
+# i386/x86-64 Universal Build mozconfig
 
 # As used here, arguments in $MOZ_BUILD_PROJECTS are suitable as arguments
 # to gcc's -arch parameter.
-mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
+mk_add_options MOZ_BUILD_PROJECTS="i386 x86_64"
 
 . $topsrcdir/build/macosx/universal/mozconfig.common

build/macosx/universal/mozconfig-64

@@ -1,7 +0,0 @@
-# i386/x86-64 Universal Build mozconfig
-
-# As used here, arguments in $MOZ_BUILD_PROJECTS are suitable as arguments
-# to gcc's -arch parameter.
-mk_add_options MOZ_BUILD_PROJECTS="i386 x86_64"
-
-. $topsrcdir/build/macosx/universal/mozconfig.common

toolkit/crashreporter/test/unit/test_crashreporter_crash.js

@@ -1,5 +1,11 @@
 function run_test()
 {
+  var isOSX = ("nsILocalFileMac" in Components.interfaces);
+  if (isOSX) {
+    dump("INFO | test_crashreporter.js | Skipping test on mac, bug 599475")
+    return;
+  }
+
   if (!("@mozilla.org/toolkit/crash-reporter;1" in Components.classes)) {
     dump("INFO | test_crashreporter.js | Can't test crashreporter in a non-libxul build.\n");
     return;

toolkit/crashreporter/test/unit/test_crashreporter_crash_profile_lock.js

@@ -1,5 +1,11 @@
 function run_test()
 {
+  var isOSX = ("nsILocalFileMac" in Components.interfaces);
+  if (isOSX) {
+    dump("INFO | test_crashreporter_crash_profile_lock.js | Skipping test on mac, bug 599475")
+    return;
+  }
+
   if (!("@mozilla.org/toolkit/crash-reporter;1" in Components.classes)) {
     dump("INFO | test_crashreporter.js | Can't test crashreporter in a non-libxul build.\n");
     return;

toolkit/mozapps/installer/package-name.mk

@@ -58,12 +58,16 @@ MOZ_PKG_PLATFORM := win32
 endif
 endif
 ifeq ($(OS_ARCH),Darwin)
+ifdef UNIVERSAL_BINARY
+MOZ_PKG_PLATFORM := mac64
+else
 ifeq ($(TARGET_CPU),x86_64)
 MOZ_PKG_PLATFORM := mac64
 else
 MOZ_PKG_PLATFORM := mac
 endif
 endif
+endif
 ifeq ($(TARGET_OS),linux-gnu)
 MOZ_PKG_PLATFORM := linux-$(TARGET_CPU)
 endif

toolkit/mozapps/plugins/tests/Makefile.in

@@ -49,12 +49,16 @@ USE_STATIC_LIBS = 1
 
 ifneq (mobile,$(MOZ_BUILD_APP))
 _BROWSER_FILES = \
-  browser_bug435788.js \
   pfs_bug435788_1.rdf \
   pfs_bug435788_2.rdf \
   GoodExtension.xpi \
   BadExtension.xpi \
   $(NULL)
+ifneq ($(OS_ARCH),Darwin)
+_BROWSER_FILES += \
+  browser_bug435788.js
+endif
+
 endif
 
 CPPSRCS = \

toolkit/mozapps/update/test/unit/test_0110_general.js

@@ -87,6 +87,12 @@ var gTestFiles = [
 }];
 
 function run_test() {
+  var isOSX = ("nsILocalFileMac" in Components.interfaces);
+  if (isOSX) {
+    dump("INFO | test_0110_general.js | Skipping test on mac, bug 599477")
+    return;
+  }
+
   var testFile;
   // The directory the updates will be applied to is the current working
   // directory and not dist/bin.

toolkit/mozapps/update/test/unit/test_0111_general.js

@@ -105,6 +105,12 @@ var gTestFiles = [
 }];
 
 function run_test() {
+  var isOSX = ("nsILocalFileMac" in Components.interfaces);
+  if (isOSX) {
+    dump("INFO | test_0111_general.js | Skipping test on mac, bug 599477")
+    return;
+  }
+
   var testFile;
   // The directory the updates will be applied to is the current working
   // directory and not dist/bin.

toolkit/mozapps/update/test/unit/test_0112_general.js

@@ -87,6 +87,12 @@ var gTestFiles = [
 }];
 
 function run_test() {
+  var isOSX = ("nsILocalFileMac" in Components.interfaces);
+  if (isOSX) {
+    dump("INFO | test_0112_general.js | Skipping test on mac, bug 599477")
+    return;
+  }
+
   var testFile;
   // The directory the updates will be applied to is the current working
   // directory and not dist/bin.

uriloader/exthandler/tests/unit/test_punycodeURIs.js

@@ -93,6 +93,12 @@ function checkFile() {
 }
 
 function run_test() {
+  var isOSX = ("nsILocalFileMac" in Components.interfaces);
+  if (isOSX) {
+    dump("INFO | test_punycodeURIs.js | Skipping test on mac, bug 599475")
+    return;
+  }
+
   // set up the uri to test with
   var ioService =
     Components.classes["@mozilla.org/network/io-service;1"]

xpcom/tests/unit/test_nsIProcess.js

@@ -251,6 +251,11 @@ function test_kill_2()
 }
 
 function run_test() {
+  var isOSX = ("nsILocalFileMac" in Components.interfaces);
+  if (isOSX) {
+    dump("INFO | test_nsIProcess.js | Skipping test on mac, bug 599478")
+    return;
+  }
   set_environment();
   test_kill();
   test_quick();