Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1825259 - Don't hold a strong ref to the service manager in TestHarness.h. r=xpcom-reviewers,nika

Browse Source 
This let's us write gtest's death tests where we manually invoke
NS_ShutdownXPCOM without tripping asserts.

Differential Revision: https://phabricator.services.mozilla.com/D174093
This commit is contained in:
Andreas Pehrson 2023-04-12 07:16:14 +00:00
parent 794c7eb9c9
commit 3b20277e81
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xpcom/tests/TestHarness.h
View File

@ -26,7 +26,6 @@
#include "nsIDirectoryService.h"
#include "nsIFile.h"
#include "nsIObserverService.h"
#include "nsIServiceManager.h"
#include "nsXULAppAPI.h"
#include <stdio.h>
#include <stdlib.h>
@ -78,15 +77,14 @@ class ScopedXPCOM : public nsIDirectoryServiceProvider2 {
explicit ScopedXPCOM(const char* testName,
nsIDirectoryServiceProvider* dirSvcProvider = nullptr)
: mServMgr(nullptr), mDirSvcProvider(dirSvcProvider) {
: mDirSvcProvider(dirSvcProvider) {
mTestName = testName;
printf("Running %s tests...\n", mTestName);
nsresult rv = NS_InitXPCOM(&mServMgr, nullptr, this);
if (NS_FAILED(rv)) {
mInitRv = NS_InitXPCOM(nullptr, nullptr, this);
if (NS_FAILED(mInitRv)) {
fail("NS_InitXPCOM returned failure code 0x%" PRIx32,
static_cast<uint32_t>(rv));
mServMgr = nullptr;
static_cast<uint32_t>(mInitRv));
return;
}
}
@ -112,8 +110,7 @@ class ScopedXPCOM : public nsIDirectoryServiceProvider2 {
mProfD = nullptr;
}
if (mServMgr) {
NS_RELEASE(mServMgr);
if (NS_SUCCEEDED(mInitRv)) {
nsresult rv = NS_ShutdownXPCOM(nullptr);
if (NS_FAILED(rv)) {
fail("XPCOM shutdown failed with code 0x%" PRIx32,
@ -125,7 +122,7 @@ class ScopedXPCOM : public nsIDirectoryServiceProvider2 {
printf("Finished running %s tests.\n", mTestName);
}
bool failed() { return mServMgr == nullptr; }
bool failed() { return NS_FAILED(mInitRv); }
already_AddRefed<nsIFile> GetProfileDirectory() {
if (mProfD) {
@ -252,7 +249,7 @@ class ScopedXPCOM : public nsIDirectoryServiceProvider2 {
private:
const char* mTestName;
nsIServiceManager* mServMgr;
nsresult mInitRv = NS_ERROR_NOT_INITIALIZED;
nsCOMPtr<nsIDirectoryServiceProvider> mDirSvcProvider;
nsCOMPtr<nsIFile> mProfD;
nsCOMPtr<nsIFile> mGRED;