mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 04:15:43 +00:00
bug 733501 - Fix crashreporter xpcshell tests to actually run. r=jmaher
This commit is contained in:
parent
1446c24a20
commit
8366731c85
@ -8802,8 +8802,12 @@ fi
|
||||
|
||||
# Generate a JSON config file for unittest harnesses etc to read
|
||||
# build configuration details from in a standardized way.
|
||||
OS_TARGET=${OS_TARGET} TARGET_CPU=${TARGET_CPU} MOZ_DEBUG=${MOZ_DEBUG} \
|
||||
MOZ_WIDGET_TOOLKIT=${MOZ_WIDGET_TOOLKIT} UNIVERSAL_BINARY=${UNIVERSAL_BINARY} \
|
||||
OS_TARGET=${OS_TARGET} \
|
||||
TARGET_CPU=${TARGET_CPU} \
|
||||
MOZ_DEBUG=${MOZ_DEBUG} \
|
||||
MOZ_WIDGET_TOOLKIT=${MOZ_WIDGET_TOOLKIT} \
|
||||
UNIVERSAL_BINARY=${UNIVERSAL_BINARY} \
|
||||
MOZ_CRASHREPORTER=${MOZ_CRASHREPORTER} \
|
||||
$PYTHON ${_topsrcdir}/config/writemozinfo.py ./mozinfo.json.tmp
|
||||
if cmp -s ./mozinfo.json.tmp ./mozinfo.json; then
|
||||
rm ./mozinfo.json.tmp
|
||||
|
@ -101,7 +101,7 @@ skip-if = os == "android"
|
||||
skip-if = !debug
|
||||
|
||||
[include:toolkit/crashreporter/test/unit/xpcshell.ini]
|
||||
skip-if = os == "linux" || !crashreporter
|
||||
skip-if = !crashreporter
|
||||
|
||||
[include:toolkit/crashreporter/test/unit_ipc/xpcshell.ini]
|
||||
skip-if = !crashreporter
|
||||
|
@ -22,8 +22,9 @@ let CrashTestUtils = {
|
||||
};
|
||||
|
||||
// Grab APIs from the testcrasher shared library
|
||||
Components.utils.import("resource://gre/modules/Services.jsm");
|
||||
Components.utils.import("resource://gre/modules/ctypes.jsm");
|
||||
let dir = __LOCATION__.parent;
|
||||
let dir = Services.dirsvc.get("CurWorkD", Components.interfaces.nsILocalFile);
|
||||
let file = dir.clone();
|
||||
file.append(ctypes.libraryName("testcrasher"));
|
||||
let lib = ctypes.open(file.path);
|
||||
|
@ -6,6 +6,8 @@ tail =
|
||||
[test_crash_purevirtual.js]
|
||||
[test_crash_runtimeabort.js]
|
||||
[test_crash_oom.js]
|
||||
skip-if = os == 'win' && debug
|
||||
|
||||
[test_crashreporter.js]
|
||||
[test_crashreporter_crash.js]
|
||||
[test_crashreporter_crash_profile_lock.js]
|
||||
|
Loading…
Reference in New Issue
Block a user