wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out ac2d2c7ccb1b (bug 770141) for possibly causing Win debug make check errors; CLOSED TREE

Browse Source
This commit is contained in:
Matt Brubeck 2012-07-24 15:03:37 -07:00
parent 9b677fd531
commit 33bfb7ea4f
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xpcom/tests/Makefile.in
View File

@ -156,7 +156,8 @@ install::
$(SYSINSTALL) $(IFLAGS1) $(srcdir)/test.properties $(DESTDIR)$(mozappdir)/res
ifeq (,$(filter-out WINNT os2-emx, $(HOST_OS_ARCH)))
getnativepath = $(call normalizepath,$(1))
swapslashes = $(shell echo $(1) | sed -e 's|/|\\|g')
getnativepath = $(call swapslashes,$(call normalizepath,$(1)))
else
getnativepath = $(1)
endif

13
xpcom/tests/TestRegistrationOrder.cpp
View File

@ -156,19 +156,8 @@ int main(int argc, char** argv)
}
ScopedLogging logging;
#ifdef XP_WIN
// On Windows, convert to backslashes
size_t regPathLen = strlen(argv[1]);
char* regPath = new char[regPathLen];
for (int i = 0; i < regPathLen; i++) {
char curr = argv[1][i];
regPath[i] = (curr == '/') ? '\\' : curr;
}
#else
const char *regPath = argv[1];
#endif
XRE_AddManifestLocation(NS_COMPONENT_LOCATION,
nsCOMPtr<nsIFile>(GetRegDirectory(regPath, "core", "component.manifest")));
XRE_AddManifestLocation(NS_COMPONENT_LOCATION,