diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-11 17:46:17 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-11 17:47:35 +0200 |
| commit | 0e01190d5f63559ab519774a79b2adaa17382df9 (patch) | |
| tree | 6adbe3cfb37ec4fca51003633bea9334f4822be5 /testing/gtest | |
| parent | ac05ab923af8bc5b0c077fe3a271492af19dbea8 (diff) | |
| parent | 597fb9fbe387378185431e1900ebe6f05ca09fbf (diff) | |
| download | UXP-0e01190d5f63559ab519774a79b2adaa17382df9.tar UXP-0e01190d5f63559ab519774a79b2adaa17382df9.tar.gz UXP-0e01190d5f63559ab519774a79b2adaa17382df9.tar.lz UXP-0e01190d5f63559ab519774a79b2adaa17382df9.tar.xz UXP-0e01190d5f63559ab519774a79b2adaa17382df9.zip | |
Remove crash reporter part 1.
Merged branch 'remove-crashreporter'
Diffstat (limited to 'testing/gtest')
| -rw-r--r-- | testing/gtest/mozilla/GTestRunner.cpp | 25 | ||||
| -rw-r--r-- | testing/gtest/rungtests.py | 1 |
2 files changed, 0 insertions, 26 deletions
diff --git a/testing/gtest/mozilla/GTestRunner.cpp b/testing/gtest/mozilla/GTestRunner.cpp index 0864db8cb..544de81da 100644 --- a/testing/gtest/mozilla/GTestRunner.cpp +++ b/testing/gtest/mozilla/GTestRunner.cpp @@ -6,9 +6,6 @@ #include "GTestRunner.h" #include "gtest/gtest.h" #include "mozilla/Attributes.h" -#ifdef MOZ_CRASHREPORTER -#include "nsICrashReporter.h" -#endif #include "testing/TestHarness.h" #include "prenv.h" #ifdef XP_WIN @@ -92,28 +89,6 @@ int RunGTestFunc() #ifdef XP_WIN mozilla::ipc::windows::InitUIThread(); #endif -#ifdef MOZ_CRASHREPORTER - nsCOMPtr<nsICrashReporter> crashreporter; - char *crashreporterStr = PR_GetEnv("MOZ_CRASHREPORTER"); - if (crashreporterStr && !strcmp(crashreporterStr, "1")) { - //TODO: move this to an even-more-common location to use in all - // C++ unittests - crashreporter = do_GetService("@mozilla.org/toolkit/crash-reporter;1"); - if (crashreporter) { - std::cerr << "Setting up crash reporting" << std::endl; - - nsCOMPtr<nsIProperties> dirsvc = - do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID); - nsCOMPtr<nsIFile> cwd; - nsresult rv = dirsvc->Get(NS_OS_CURRENT_WORKING_DIR, - NS_GET_IID(nsIFile), - getter_AddRefs(cwd)); - MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv)); - crashreporter->SetEnabled(true); - crashreporter->SetMinidumpPath(cwd); - } - } -#endif return RUN_ALL_TESTS(); } diff --git a/testing/gtest/rungtests.py b/testing/gtest/rungtests.py index e9e33cca2..499908680 100644 --- a/testing/gtest/rungtests.py +++ b/testing/gtest/rungtests.py @@ -89,7 +89,6 @@ class GTests(object): ) env["XPCOM_DEBUG_BREAK"] = "stack-and-abort" env["MOZ_CRASHREPORTER_NO_REPORT"] = "1" - env["MOZ_CRASHREPORTER"] = "1" env["MOZ_RUN_GTEST"] = "1" # Normally we run with GTest default output, override this to use the TBPL test format. env["MOZ_TBPL_PARSER"] = "1" |