bug 573290, bug 583591 - disable crashreporter xpcshell tests on Linux again until we can figure out why they're failing
authorTed Mielczarek <ted.mielczarek@gmail.com>
Fri, 13 Aug 2010 08:28:15 -0400
changeset 50415 69e2e34ccddc892a0c582e0e1b7ccc5df04843ab
parent 50414 860c490eb8492eb90b9ca1b493d85a6fc9b33fc2
child 50416 4b75be253a5ad410e830d1df407d2805dc6d6b89
push idunknown
push userunknown
push dateunknown
bugs573290, 583591
milestone2.0b4pre
bug 573290, bug 583591 - disable crashreporter xpcshell tests on Linux again until we can figure out why they're failing
modules/plugin/test/mochitest/Makefile.in
toolkit/crashreporter/Makefile.in
--- a/modules/plugin/test/mochitest/Makefile.in
+++ b/modules/plugin/test/mochitest/Makefile.in
@@ -105,23 +105,26 @@ endif
 
 _MOCHICHROME_FILES = \
   test_bug479979.xul \
   test_npruntime.xul   \
   test_privatemode.xul \
   test_wmode.xul \
   $(NULL)
 
+# Temporarily disable the tests on Linux, see bug 573290 and bug 583591.
+ifneq ($(OS_ARCH),Linux)
 ifdef MOZ_CRASHREPORTER
 _MOCHICHROME_FILES += \
   test_crash_notify.xul \
   test_crash_notify_no_report.xul \
   test_crash_submit.xul \
   $(NULL)
 endif
+endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 _MOCHICHROME_FILES += \
   test_convertpoint.xul \
   $(NULL)
 
 _MOCHITEST_FILES += \
   test_cocoa_window_focus.html \
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -107,12 +107,15 @@ CPPSRCS = \
 
 FORCE_STATIC_LIB = 1
 
 EXTRA_JS_MODULES = \
   CrashSubmit.jsm \
   $(NULL)
 
 ifdef ENABLE_TESTS
+# Temporarily disable the tests on Linux, see bug 573290 and bug 583591
+ifneq ($(OS_ARCH),Linux)
 TOOL_DIRS = test
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk