diff options
Diffstat (limited to 'Tools/WebKitTestRunner/win')
7 files changed, 7 insertions, 3 deletions
diff --git a/Tools/WebKitTestRunner/win/InjectedBundleProduction.vsprops b/Tools/WebKitTestRunner/win/InjectedBundleProduction.vsprops index b036c84..a8e0607 100644 --- a/Tools/WebKitTestRunner/win/InjectedBundleProduction.vsprops +++ b/Tools/WebKitTestRunner/win/InjectedBundleProduction.vsprops @@ -5,7 +5,7 @@ Name="InjectedBundleProduction" InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; - $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops; ..\Configurations\InjectedBundleCoreFoundation.vsprops; ..\Configurations\InjectedBundleCommon.vsprops" diff --git a/Tools/WebKitTestRunner/win/InjectedBundleRelease.vsprops b/Tools/WebKitTestRunner/win/InjectedBundleRelease.vsprops index 8f65ff3..8c88cf8 100644 --- a/Tools/WebKitTestRunner/win/InjectedBundleRelease.vsprops +++ b/Tools/WebKitTestRunner/win/InjectedBundleRelease.vsprops @@ -5,6 +5,7 @@ Name="InjectedBundleRelease" InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; ..\Configurations\InjectedBundleCoreFoundation.vsprops; ..\Configurations\InjectedBundleCommon.vsprops" diff --git a/Tools/WebKitTestRunner/win/InjectedBundleReleaseCairoCFLite.vsprops b/Tools/WebKitTestRunner/win/InjectedBundleReleaseCairoCFLite.vsprops index c7dfb84..22fddd3 100644 --- a/Tools/WebKitTestRunner/win/InjectedBundleReleaseCairoCFLite.vsprops +++ b/Tools/WebKitTestRunner/win/InjectedBundleReleaseCairoCFLite.vsprops @@ -5,6 +5,7 @@ Name="InjectedBundleReleaseCairoCFLite" InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops; ..\Configurations\InjectedBundleCFLite.vsprops; diff --git a/Tools/WebKitTestRunner/win/TestInvocationWin.cpp b/Tools/WebKitTestRunner/win/TestInvocationWin.cpp index 7c79ff5..2aec9ae 100644 --- a/Tools/WebKitTestRunner/win/TestInvocationWin.cpp +++ b/Tools/WebKitTestRunner/win/TestInvocationWin.cpp @@ -28,7 +28,7 @@ namespace WTR { -#if !PLATFORM(CG) +#if !USE(CG) && !USE(CAIRO) void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef) { } diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerProduction.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerProduction.vsprops index 28dbf04..c11c3ff 100644 --- a/Tools/WebKitTestRunner/win/WebKitTestRunnerProduction.vsprops +++ b/Tools/WebKitTestRunner/win/WebKitTestRunnerProduction.vsprops @@ -5,7 +5,7 @@ Name="WebKitTestRunnerProduction" InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; - $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops; ..\Configurations\WebKitTestRunnerCommon.vsprops; ..\Configurations\WebKitTestRunnerCoreFoundation.vsprops; diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerRelease.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerRelease.vsprops index 788f4ef..1987a61 100644 --- a/Tools/WebKitTestRunner/win/WebKitTestRunnerRelease.vsprops +++ b/Tools/WebKitTestRunner/win/WebKitTestRunnerRelease.vsprops @@ -5,6 +5,7 @@ Name="WebKitTestRunnerRelease" InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; ..\Configurations\WebKitTestRunnerCommon.vsprops; ..\Configurations\WebKitTestRunnerCoreFoundation.vsprops; diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerReleaseCairoCFLite.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerReleaseCairoCFLite.vsprops index f6e0f00..c5a73a5 100644 --- a/Tools/WebKitTestRunner/win/WebKitTestRunnerReleaseCairoCFLite.vsprops +++ b/Tools/WebKitTestRunner/win/WebKitTestRunnerReleaseCairoCFLite.vsprops @@ -5,6 +5,7 @@ Name="WebKitTestRunnerReleaseCairoCFLite" InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops; ..\Configurations\WebKitTestRunnerCommon.vsprops; |