Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset fef97fa21915 (bug 584582) for causing compilation failures on Windows.

Browse Source
This commit is contained in:
L. David Baron 2010-08-11 12:25:55 -07:00
parent 76e6ca6946
commit 2416326121
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/plugin/test/mochitest/Makefile.in
View File

@ -110,6 +110,8 @@ _MOCHICHROME_FILES = \
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 \
@ -117,6 +119,7 @@ _MOCHICHROME_FILES += \
test_crash_submit.xul \
$(NULL)
endif
endif
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
_MOCHICHROME_FILES += \

3
toolkit/crashreporter/Makefile.in
View File

@ -112,7 +112,10 @@ EXTRA_JS_MODULES = \
$(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

18
toolkit/crashreporter/nsExceptionHandler.cpp
View File

@ -144,7 +144,7 @@ typedef std::string xpstring;
#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)
@ -223,15 +223,6 @@ static const char* kSubprocessBlacklist[] = {
#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)
@ -303,11 +294,11 @@ bool MinidumpCallback(const XP_CHAR* dump_path,
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) {
@ -576,8 +567,7 @@ nsresult SetExceptionHandler(nsILocalFile* aXREDirectory,
// 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));