Backed out changeset fef97fa21915 (bug 584582) for causing compilation failures on Windows.
authorL. David Baron <dbaron@dbaron.org>
Wed, 11 Aug 2010 12:25:55 -0700
changeset 49556 89aad8922d715d0ef6aed75907fb8e242f4d70d3
parent 49554 fef97fa21915fc51e8e4d231e1103b3d4eba1858
child 49557 84f27c15799759c6791baeb48f2cd5524508acc1
push idunknown
push userunknown
push dateunknown
bugs584582
milestone2.0b4pre
backs outfef97fa21915fc51e8e4d231e1103b3d4eba1858
Backed out changeset fef97fa21915 (bug 584582) for causing compilation failures on Windows.
modules/plugin/test/mochitest/Makefile.in
toolkit/crashreporter/Makefile.in
toolkit/crashreporter/nsExceptionHandler.cpp
--- 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
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -139,17 +139,17 @@ typedef std::string xpstring;
 #define CONVERT_UTF16_TO_XP_CHAR(x) NS_ConvertUTF16toUTF8(x)
 #define CONVERT_XP_CHAR_TO_UTF16(x) NS_ConvertUTF8toUTF16(x)
 #define CRASH_REPORTER_FILENAME "crashreporter"
 #define PATH_SEPARATOR "/"
 #define XP_PATH_SEPARATOR "/"
 #define XP_PATH_MAX PATH_MAX
 #ifdef XP_LINUX
 #define XP_STRLEN(x) my_strlen(x)
-#define XP_TTOA(time, buffer, base) my_timetostring(time, buffer, sizeof(buffer))
+#define XP_TTOA(time, buffer, base) my_itos(buffer, time, sizeof(buffer))
 #else
 #define XP_STRLEN(x) strlen(x)
 #define XP_TTOA(time, buffer, base) sprintf(buffer, "%ld", time)
 #define sys_close close
 #define sys_fork fork
 #define sys_open open
 #define sys_write write
 #endif
@@ -218,25 +218,16 @@ static const char* kSubprocessBlacklist[
   "FramePoisonSize",
   "StartupTime",
   "URL"
 };
 
 
 #endif  // MOZ_IPC
 
-#ifdef XP_LINUX
-inline void
-my_timetostring(time_t t, char* buffer, size_t buffer_length)
-{
-  my_memset(buffer, 0, buffer_length);
-  my_itos(buffer, t, my_int_len(t));
-}
-#endif
-
 #ifdef XP_WIN
 static void
 CreateFileFromPath(const xpstring& path, nsILocalFile** file)
 {
   NS_NewLocalFile(nsDependentString(path.c_str()), PR_FALSE, file);
 }
 #else
 static void
@@ -298,21 +289,21 @@ bool MinidumpCallback(const XP_CHAR* dum
   time_t timeSinceLastCrash = 0;
   // stringified versions of the above
   char crashTimeString[32];
   int crashTimeStringLen = 0;
   char timeSinceLastCrashString[32];
   int timeSinceLastCrashStringLen = 0;
 
   XP_TTOA(crashTime, crashTimeString, 10);
-  crashTimeStringLen = XP_STRLEN(crashTimeString);
+  crashTimeStringLen = strlen(crashTimeString);
   if (lastCrashTime != 0) {
     timeSinceLastCrash = crashTime - lastCrashTime;
     XP_TTOA(timeSinceLastCrash, timeSinceLastCrashString, 10);
-    timeSinceLastCrashStringLen = XP_STRLEN(timeSinceLastCrashString);
+    timeSinceLastCrashStringLen = strlen(timeSinceLastCrashString);
   }
   // write crash time to file
   if (lastCrashTimeFilename[0] != 0) {
 #if defined(XP_WIN32)
     HANDLE hFile = CreateFile(lastCrashTimeFilename, GENERIC_WRITE, 0,
                               NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL,
                               NULL);
     if(hFile != INVALID_HANDLE_VALUE) {
@@ -571,18 +562,17 @@ nsresult SetExceptionHandler(nsILocalFil
                      true);
 #endif
 
   if (!gExceptionHandler)
     return NS_ERROR_OUT_OF_MEMORY;
 
   // store application start time
   char timeString[32];
-  time_t startupTime = time(NULL);
-  XP_TTOA(startupTime, timeString, 10);
+  XP_TTOA(time(NULL), timeString, 10);
   AnnotateCrashReport(NS_LITERAL_CSTRING("StartupTime"),
                       nsDependentCString(timeString));
 
 #if defined(XP_MACOSX)
   // On OS X, many testers like to see the OS crash reporting dialog
   // since it offers immediate stack traces.  We allow them to set
   // a default to pass exceptions to the OS handler.
   Boolean keyExistsAndHasValidFormat = false;