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

Bug 878208 - Fix: Firefox does not receive the first command line parameter handed to it from metrotestharness, plus some output improvements in the harness. r=bbondy

Browse Source
This commit is contained in:
Jim Mathies 2013-06-03 05:33:13 -04:00
parent 38e35a7088
commit 0b65b517ed
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
browser/metro/shell/testing/metrotestharness.cpp
View File

@ -228,6 +228,16 @@ static bool Launch()
Log(L"Harness process id: %d", GetCurrentProcessId());
// If provided, validate the firefox path passed in.
int binLen = wcslen(kFirefoxExe);
if (sFirefoxPath.GetLength() && sFirefoxPath.Right(binLen) != kFirefoxExe) {
Log(L"firefoxpath is missing a valid bin name! Assuming '%s'.", kFirefoxExe);
if (sFirefoxPath.Right(1) != L"\\") {
sFirefoxPath += L"\\";
}
sFirefoxPath += kFirefoxExe;
}
// Because we can't pass command line args, we store params in a
// tests.ini file in dist/bin which the browser picks up on launch.
CStringA testFilePath;
@ -254,9 +264,19 @@ static bool Launch()
*slash = '\0'; // no trailing slash
testFilePath = path;
testFilePath += "\\";
sFirefoxPath = testFilePath;
sFirefoxPath += kFirefoxExe;
testFilePath += kMetroTestFile;
}
// Make sure the firefox bin exists
if (GetFileAttributesW(sFirefoxPath) == INVALID_FILE_ATTRIBUTES) {
Fail(L"Invalid bin path: '%s'", sFirefoxPath);
return false;
}
Log(L"Using bin path: '%s'", sFirefoxPath);
Log(L"Writing out tests.ini to: '%s'", CStringW(testFilePath));
HANDLE hTestFile = CreateFileA(testFilePath, GENERIC_WRITE,
0, NULL, CREATE_ALWAYS,
@ -269,7 +289,13 @@ static bool Launch()
DeleteTestFileHelper dtf(testFilePath);
CStringA asciiParams = sAppParams;
// nsAppRunner expects the first param to be the bin path, just like a
// normal startup. So prepend our bin path to our param string we write.
CStringA asciiParams = sFirefoxPath;
asciiParams += " ";
asciiParams += sAppParams;
asciiParams.Trim();
Log(L"Browser command line args: '%s'", CString(asciiParams));
if (!WriteFile(hTestFile, asciiParams, asciiParams.GetLength(), NULL, 0)) {
CloseHandle(hTestFile);
Fail(L"WriteFile errorno=%d", GetLastError());
@ -350,12 +376,7 @@ int wmain(int argc, WCHAR* argv[])
sAppParams.Append(L" ");
}
sAppParams.Trim();
if (sFirefoxPath.GetLength()) {
Log(L"firefoxpath: '%s'", sFirefoxPath);
}
Log(L"args: '%s'", sAppParams);
Launch();
CoUninitialize();
return 0;
}