Title: [165097] trunk/Tools
- Revision
- 165097
- Author
- [email protected]
- Date
- 2014-03-04 22:24:23 -0800 (Tue, 04 Mar 2014)
Log Message
Preparing to run layout tests on Wincairo.
https://bugs.webkit.org/show_bug.cgi?id=129709
Patch by Alex Christensen <[email protected]> on 2014-03-04
Reviewed by Brent Fulgham.
* Scripts/webkitdirs.pm:
(setPathForRunningWebKitApp):
Add GStreamer directory for WinCairo running layout tests.
* win/DLLLauncher/DLLLauncherMain.cpp:
(modifyPath):
Added the WinCairo bin32 or bin64 directory for running WinLauncher.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (165096 => 165097)
--- trunk/Tools/ChangeLog 2014-03-05 05:55:28 UTC (rev 165096)
+++ trunk/Tools/ChangeLog 2014-03-05 06:24:23 UTC (rev 165097)
@@ -1,3 +1,17 @@
+2014-03-04 Alex Christensen <[email protected]>
+
+ Preparing to run layout tests on Wincairo.
+ https://bugs.webkit.org/show_bug.cgi?id=129709
+
+ Reviewed by Brent Fulgham.
+
+ * Scripts/webkitdirs.pm:
+ (setPathForRunningWebKitApp):
+ Add GStreamer directory for WinCairo running layout tests.
+ * win/DLLLauncher/DLLLauncherMain.cpp:
+ (modifyPath):
+ Added the WinCairo bin32 or bin64 directory for running WinLauncher.
+
2014-03-04 Martin Robinson <[email protected]>
[GTK] Simplify the GObject DOM bindings API break check into one step
Modified: trunk/Tools/Scripts/webkitdirs.pm (165096 => 165097)
--- trunk/Tools/Scripts/webkitdirs.pm 2014-03-05 05:55:28 UTC (rev 165096)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-03-05 06:24:23 UTC (rev 165097)
@@ -2125,7 +2125,8 @@
$env->{PATH} = join(':', productDir(), dirname(installedSafariPath()), appleApplicationSupportPath(), $env->{PATH} || "");
} elsif (isWinCairo()) {
my $winCairoBin = sourceDir() . "/WebKitLibraries/win/" . (isWin64() ? "bin64/" : "bin32/");
- $env->{PATH} = join(':', productDir(), $winCairoBin , $env->{PATH} || "");
+ my $gstreamerBin = isWin64() ? $ENV{"GSTREAMER_1_0_ROOT_X86_64"} . "bin" : $ENV{"GSTREAMER_1_0_ROOT_X86"} . "bin";
+ $env->{PATH} = join(':', productDir(), $winCairoBin, $gstreamerBin, $env->{PATH} || "");
}
}
Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (165096 => 165097)
--- trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2014-03-05 05:55:28 UTC (rev 165096)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2014-03-05 06:24:23 UTC (rev 165097)
@@ -133,12 +133,15 @@
#ifdef WIN_CAIRO
#if defined(_M_X64)
- wstring path = copyEnvironmentVariable(L"GSTREAMER_1_0_ROOT_X86_64") + L"bin";
+ wstring pathGStreamer = copyEnvironmentVariable(L"GSTREAMER_1_0_ROOT_X86_64") + L"bin";
+ wstring pathWinCairo = copyEnvironmentVariable(L"WEBKIT_LIBRARIES") + L"\\bin64";
#else
- wstring path = copyEnvironmentVariable(L"GSTREAMER_1_0_ROOT_X86") + L"bin";
+ wstring pathGStreamer = copyEnvironmentVariable(L"GSTREAMER_1_0_ROOT_X86") + L"bin";
+ wstring pathWinCairo = copyEnvironmentVariable(L"WEBKIT_LIBRARIES") + L"\\bin32";
#endif
- if (directoryExists(path))
- prependPath(path);
+ prependPath(pathWinCairo);
+ if (directoryExists(pathGStreamer))
+ prependPath(pathGStreamer);
return true;
#else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
