Let TestWebKitAPI work for chromium
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Sep 2011 14:08:42 +0000 (14:08 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Sep 2011 14:08:42 +0000 (14:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=67756

Patch by Xianzhu Wang <wangxianzhu@chromium.org> on 2011-09-15
Reviewed by Sam Weinig.

Source/WebKit/chromium:

* WebKit.gyp:

Tools:

* Scripts/build-api-tests:
* Scripts/run-api-tests:
(isSupportedPlatform):
(runTest):
(populateTests):
* Scripts/webkitdirs.pm:
(determineBaseProductDir):
* TestWebKitAPI/Configurations/InjectedBundle.xcconfig:
* TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig:
* TestWebKitAPI/Configurations/TestWebKitAPICommon.vsprops:
* TestWebKitAPI/InjectedBundleController.cpp:
* TestWebKitAPI/InjectedBundleMain.cpp:
* TestWebKitAPI/JavaScriptTest.cpp:
* TestWebKitAPI/PlatformUtilities.cpp:
* TestWebKitAPI/TestWebKitAPI.gypi: Added.
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/TestWebKitAPIPrefix.h: Removed.
* TestWebKitAPI/Tests/WTF/CheckedArithmeticOperations.cpp:
* TestWebKitAPI/Tests/WTF/StringOperators.cpp:
* TestWebKitAPI/Tests/WTF/VectorBasic.cpp:
* TestWebKitAPI/Tests/WTF/VectorReverse.cpp:
* TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp:
* TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp:
* TestWebKitAPI/Tests/WebKit2/CanHandleRequest_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/CookieManager.cpp:
* TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp:
* TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp:
* TestWebKitAPI/Tests/WebKit2/EvaluateJavaScript.cpp:
* TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp:
* TestWebKitAPI/Tests/WebKit2/Find.cpp:
* TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp:
* TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp:
* TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp:
* TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp:
* TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp:
* TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp:
* TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp:
* TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:
* TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp:
* TestWebKitAPI/Tests/WebKit2/PreventEmptyUserAgent.cpp:
* TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp:
* TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp:
* TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp:
* TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
* TestWebKitAPI/Tests/WebKit2/WKString.cpp:
* TestWebKitAPI/Tests/WebKit2/WKStringJSString.cpp:
* TestWebKitAPI/Tests/WebKit2/win/AltKeyGeneratesWMSysCommand.cpp:
* TestWebKitAPI/Tests/WebKit2/win/DoNotCopyANullCFURLResponse.cpp:
* TestWebKitAPI/Tests/WebKit2/win/HideFindIndicator.cpp:
* TestWebKitAPI/Tests/WebKit2/win/ResizeViewWhileHidden.cpp:
* TestWebKitAPI/Tests/WebKit2/win/TranslateMessageGeneratesWMChar.cpp:
* TestWebKitAPI/Tests/WebKit2/win/WMCloseCallsUIClientClose.cpp:
* TestWebKitAPI/Tests/WebKit2/win/WMPrint.cpp:
* TestWebKitAPI/TestsController.cpp:
* TestWebKitAPI/config.h: Copied from TestWebKitAPI/TestWebKitAPIPrefix.h.
* TestWebKitAPI/win/InjectedBundleControllerWin.cpp:
* TestWebKitAPI/win/PlatformUtilitiesWin.cpp:
* TestWebKitAPI/win/PlatformWebViewWin.cpp:
* TestWebKitAPI/win/TestWebKitAPI.vcproj:
* TestWebKitAPI/win/main.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@95188 268f45cc-cd09-0410-ab3c-d52691b4dbfc

64 files changed:
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gyp
Tools/ChangeLog
Tools/Scripts/build-api-tests
Tools/Scripts/run-api-tests
Tools/Scripts/webkitdirs.pm
Tools/TestWebKitAPI/Configurations/InjectedBundle.xcconfig
Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig
Tools/TestWebKitAPI/Configurations/TestWebKitAPICommon.vsprops
Tools/TestWebKitAPI/InjectedBundleController.cpp
Tools/TestWebKitAPI/InjectedBundleMain.cpp
Tools/TestWebKitAPI/JavaScriptTest.cpp
Tools/TestWebKitAPI/PlatformUtilities.cpp
Tools/TestWebKitAPI/TestWebKitAPI.gypi [new file with mode: 0644]
Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
Tools/TestWebKitAPI/Tests/WTF/CheckedArithmeticOperations.cpp
Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp
Tools/TestWebKitAPI/Tests/WTF/VectorBasic.cpp
Tools/TestWebKitAPI/Tests/WTF/VectorReverse.cpp
Tools/TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp
Tools/TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp
Tools/TestWebKitAPI/Tests/WebKit2/CanHandleRequest_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/CookieManager.cpp
Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit2/EvaluateJavaScript.cpp
Tools/TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp
Tools/TestWebKitAPI/Tests/WebKit2/Find.cpp
Tools/TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp
Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp
Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp
Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp
Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp
Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp
Tools/TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp
Tools/TestWebKitAPI/Tests/WebKit2/PreventEmptyUserAgent.cpp
Tools/TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp
Tools/TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly_Bundle.cpp
Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp
Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp
Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp
Tools/TestWebKitAPI/Tests/WebKit2/WKString.cpp
Tools/TestWebKitAPI/Tests/WebKit2/WKStringJSString.cpp
Tools/TestWebKitAPI/Tests/WebKit2/win/AltKeyGeneratesWMSysCommand.cpp
Tools/TestWebKitAPI/Tests/WebKit2/win/DoNotCopyANullCFURLResponse.cpp
Tools/TestWebKitAPI/Tests/WebKit2/win/HideFindIndicator.cpp
Tools/TestWebKitAPI/Tests/WebKit2/win/ResizeViewWhileHidden.cpp
Tools/TestWebKitAPI/Tests/WebKit2/win/TranslateMessageGeneratesWMChar.cpp
Tools/TestWebKitAPI/Tests/WebKit2/win/WMCloseCallsUIClientClose.cpp
Tools/TestWebKitAPI/Tests/WebKit2/win/WMPrint.cpp
Tools/TestWebKitAPI/TestsController.cpp
Tools/TestWebKitAPI/config.h [moved from Tools/TestWebKitAPI/TestWebKitAPIPrefix.h with 97% similarity]
Tools/TestWebKitAPI/win/InjectedBundleControllerWin.cpp
Tools/TestWebKitAPI/win/PlatformUtilitiesWin.cpp
Tools/TestWebKitAPI/win/PlatformWebViewWin.cpp
Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj
Tools/TestWebKitAPI/win/main.cpp

index 7dd2aa78bfdb63539f001ee430a0b7a5a05a813c..bcd79d4117ce3a5e5514c13003de428a8a82dce5 100644 (file)
@@ -1,3 +1,12 @@
+2011-09-15  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        Let TestWebKitAPI work for chromium
+        https://bugs.webkit.org/show_bug.cgi?id=67756
+
+        Reviewed by Sam Weinig.
+
+        * WebKit.gyp:
+
 2011-09-14  Hao Zheng  <zhenghao@chromium.org>
 
         Remove some dependencies of DRT for Android.
index f6a54e7681f605f5326c6d23b18f9cd93c0ac1f3..acf7a123c050ff3f1a9cde1151f0f055bd97cd98 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010 Google Inc. All rights reserved.
+# Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -32,6 +32,7 @@
     'includes': [
         '../../WebCore/WebCore.gypi',
         '../../../Tools/DumpRenderTree/DumpRenderTree.gypi',
+        '../../../Tools/TestWebKitAPI/TestWebKitAPI.gypi',
         'WebKit.gypi',
         'features.gypi',
     ],
                 }],
             ],
         },
+        {
+            'target_name': 'TestWebKitAPI',
+            'type': 'executable',
+            'dependencies': [
+                'webkit',
+                '../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
+                '<(chromium_src_dir)/base/base.gyp:test_support_base',
+                '<(chromium_src_dir)/testing/gtest.gyp:gtest',
+                '<(chromium_src_dir)/testing/gmock.gyp:gmock',
+                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
+            ],
+            'include_dirs+': [
+                '../../../Tools/TestWebKitAPI',
+                'public',
+                'src',
+            ],
+            'sources': [
+                'tests/RunAllTests.cpp',
+                '<@(TestWebKitAPI_files)',
+            ],
+        },
     ], # targets
     'conditions': [
         ['OS=="win"', {
index ab59a9d8c35c52f470c30eda4c1a71888933d0b5..a947cbff430317a91d5c5a7370603a672533d58c 100644 (file)
@@ -1,3 +1,77 @@
+2011-09-15  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        Let TestWebKitAPI work for chromium
+        https://bugs.webkit.org/show_bug.cgi?id=67756
+
+        Reviewed by Sam Weinig.
+
+        * Scripts/build-api-tests:
+        * Scripts/run-api-tests:
+        (isSupportedPlatform):
+        (runTest):
+        (populateTests):
+        * Scripts/webkitdirs.pm:
+        (determineBaseProductDir):
+        * TestWebKitAPI/Configurations/InjectedBundle.xcconfig:
+        * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig:
+        * TestWebKitAPI/Configurations/TestWebKitAPICommon.vsprops:
+        * TestWebKitAPI/InjectedBundleController.cpp:
+        * TestWebKitAPI/InjectedBundleMain.cpp:
+        * TestWebKitAPI/JavaScriptTest.cpp:
+        * TestWebKitAPI/PlatformUtilities.cpp:
+        * TestWebKitAPI/TestWebKitAPI.gypi: Added.
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/TestWebKitAPIPrefix.h: Removed.
+        * TestWebKitAPI/Tests/WTF/CheckedArithmeticOperations.cpp:
+        * TestWebKitAPI/Tests/WTF/StringOperators.cpp:
+        * TestWebKitAPI/Tests/WTF/VectorBasic.cpp:
+        * TestWebKitAPI/Tests/WTF/VectorReverse.cpp:
+        * TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp:
+        * TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp:
+        * TestWebKitAPI/Tests/WebKit2/CanHandleRequest_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/CookieManager.cpp:
+        * TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp:
+        * TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp:
+        * TestWebKitAPI/Tests/WebKit2/EvaluateJavaScript.cpp:
+        * TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp:
+        * TestWebKitAPI/Tests/WebKit2/Find.cpp:
+        * TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp:
+        * TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp:
+        * TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp:
+        * TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp:
+        * TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp:
+        * TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp:
+        * TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:
+        * TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp:
+        * TestWebKitAPI/Tests/WebKit2/PreventEmptyUserAgent.cpp:
+        * TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp:
+        * TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp:
+        * TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp:
+        * TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
+        * TestWebKitAPI/Tests/WebKit2/WKString.cpp:
+        * TestWebKitAPI/Tests/WebKit2/WKStringJSString.cpp:
+        * TestWebKitAPI/Tests/WebKit2/win/AltKeyGeneratesWMSysCommand.cpp:
+        * TestWebKitAPI/Tests/WebKit2/win/DoNotCopyANullCFURLResponse.cpp:
+        * TestWebKitAPI/Tests/WebKit2/win/HideFindIndicator.cpp:
+        * TestWebKitAPI/Tests/WebKit2/win/ResizeViewWhileHidden.cpp:
+        * TestWebKitAPI/Tests/WebKit2/win/TranslateMessageGeneratesWMChar.cpp:
+        * TestWebKitAPI/Tests/WebKit2/win/WMCloseCallsUIClientClose.cpp:
+        * TestWebKitAPI/Tests/WebKit2/win/WMPrint.cpp:
+        * TestWebKitAPI/TestsController.cpp:
+        * TestWebKitAPI/config.h: Copied from TestWebKitAPI/TestWebKitAPIPrefix.h.
+        * TestWebKitAPI/win/InjectedBundleControllerWin.cpp:
+        * TestWebKitAPI/win/PlatformUtilitiesWin.cpp:
+        * TestWebKitAPI/win/PlatformWebViewWin.cpp:
+        * TestWebKitAPI/win/TestWebKitAPI.vcproj:
+        * TestWebKitAPI/win/main.cpp:
+
 2011-09-15  Jochen Eisinger  <jochen@chromium.org>
 
         [chromium] extract normalization of LayoutTests URLs to a method of TestShell
index f6ddec046697570222cb0e34ef4eb4b2dbae1cca..09d19bf231806c532432d557eb2d174635955af4 100755 (executable)
@@ -66,6 +66,9 @@ if (isAppleMacWebKit()) {
 } elsif (isAppleWinWebKit()) {
     chdir "Tools/TestWebKitAPI" or die;
     $result = buildVisualStudioProject("win/TestWebKitAPI.sln", $clean);
+} elsif (isChromium()) {
+    # Chromium build everything in one shot. No need to build anything here.
+    $result = 0;
 } else {
     die "TestWebKitAPI is not supported on this platform.\n";
 }
index b863897764a9844cdcc2f2daed9016316c54b2b6..3b60bd5b8b750a7dbe612f9d1afa753ac8143e92 100755 (executable)
@@ -66,6 +66,7 @@ Usage: $programName [options]
   -v|--verbose          Verbose output
   -d|--dump-tests       Dump the names of testcases without running them
   --[no-]build          Build (or do not build) unit tests prior to running (default: $buildDefault)
+  --chromium            Run the Chromium port on Mac/Win/Linux
 EOF
 
 GetOptions(
@@ -94,6 +95,11 @@ if (runAllTests()) {
     exit 1;
 }
 
+sub isSupportedPlatform()
+{
+    return isAppleMacWebKit() || isAppleWinWebKit() || isChromium();
+}
+
 sub dumpAllTests()
 {
     print "Dumping test cases\n";
@@ -145,7 +151,7 @@ sub runTest($$)
     my $result = 0;
     my $timedOut = 0;
 
-    die "run-api-tests is not supported on this platform.\n" unless isAppleMacWebKit() || isAppleWinWebKit();
+    die "run-api-tests is not supported on this platform.\n" unless isSupportedPlatform();
 
     prepareEnvironmentForRunningTestTool();
 
@@ -202,7 +208,7 @@ sub populateTests()
     my @tests;
     my $timedOut;
 
-    die "run-api-tests is not supported on this platform.\n" unless isAppleMacWebKit() || isAppleWinWebKit();
+    die "run-api-tests is not supported on this platform.\n" unless isSupportedPlatform();
 
     prepareEnvironmentForRunningTestTool();
 
index 42f3aff9d4522bb9d196cf60aeb1e07b8c6b3ee2..962a168a3856758b7f78bfd41e4f82db30247ce3 100644 (file)
@@ -155,6 +155,8 @@ sub determineBaseProductDir
     } elsif (isSymbian()) {
         # Shadow builds are not supported on Symbian
         $baseProductDir = $sourceDir;
+    } elsif (isChromium()) {
+        $baseProductDir = "$sourceDir/out";
     }
 
     if (!defined($baseProductDir)) { # Port-spesific checks failed, use default
index 7f8c897b4e4184afe98b9e04ae40b771db20a830..164a05cff8d30d15214614564932032fe450ac9e 100644 (file)
@@ -22,4 +22,3 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 PRODUCT_NAME = InjectedBundleTestWebKitAPI;
-GCC_PREFIX_HEADER = TestWebKitAPIPrefix.h;
index 5e69d0e39c97bebadd61aac79cbed5d0a6b2fd8c..c2ab7cd23bb7cd9696990e9a1449ba02e0a692f6 100644 (file)
@@ -23,4 +23,3 @@
 
 PRODUCT_NAME = TestWebKitAPI
 GCC_ENABLE_OBJC_EXCEPTIONS = YES
-GCC_PREFIX_HEADER = TestWebKitAPIPrefix.h
index aebfc92ef5eac3a4d005d73ab1af18f07dac912f..bd7f45b2c34620e52e5b61fd11c716903c58d859 100644 (file)
@@ -7,7 +7,6 @@
        <Tool
                Name="VCCLCompilerTool"
                 AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ConfigurationBuildDir)\include&quot;;&quot;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(ProjectDir)\..\..\..\Source\ThirdParty\gtest\include&quot;"
-               ForcedIncludeFiles="TestWebKitAPIPrefix.h"
        />
        <Tool
                Name="VCLinkerTool"
index f3123777c95264dc7bd388e5f246feda9b358ba5..13375c5acae51df9b88c36a32810340a8b4d4c95 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "InjectedBundleController.h"
 
 #include "InjectedBundleTest.h"
index 355c35ba6660059f355bddc1719551f944c2c408..8ad6c2badcdc01b430f9cf29f5732f4ded882bd7 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "InjectedBundleController.h"
 #include <WebKit2/WKBundleInitialize.h>
 
index 4802c71f903e3470b3a11c4db97c49f19da86a1c..4f109b659a16793da518adab52c3442bc5482465 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "JavaScriptTest.h"
 
 #include "PlatformUtilities.h"
index 7e91d6c9351d6e0bfd5dac2c52082558cc9af781..ec20dc1e0492ee2383d87267452d7cdb480c59ae 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 
 #include <wtf/OwnArrayPtr.h>
diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.gypi b/Tools/TestWebKitAPI/TestWebKitAPI.gypi
new file mode 100644 (file)
index 0000000..571a22f
--- /dev/null
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2011 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#         * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#         * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#         * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+{
+    'variables': {
+        'TestWebKitAPI_files': [
+            'Tests/WTF/CheckedArithmeticOperations.cpp',
+            'Tests/WTF/StringOperators.cpp',
+            'Tests/WTF/VectorBasic.cpp',
+            'Tests/WTF/VectorReverse.cpp',
+        ],
+    },
+}
index fa1d02316971d52945c38cc7fbde45917550eb55..4ba8b5ab57c1dd8baee3089df5a82a2edae9af99 100644 (file)
                BC131883117114A800B69727 /* PlatformUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformUtilities.h; sourceTree = "<group>"; };
                BC131884117114B600B69727 /* PlatformUtilitiesMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformUtilitiesMac.mm; sourceTree = "<group>"; };
                BC131A9A1171316900B69727 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
-               BC131A9E1171317C00B69727 /* TestWebKitAPIPrefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestWebKitAPIPrefix.h; sourceTree = "<group>"; };
+               BC131A9E1171317C00B69727 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
                BC131AA8117131FC00B69727 /* TestsController.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = TestsController.cpp; sourceTree = "<group>"; };
                BC246D8C132F115A00B56D7C /* AboutBlankLoad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AboutBlankLoad.cpp; sourceTree = "<group>"; };
                BC246D97132F1FE100B56D7C /* CanHandleRequest_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CanHandleRequest_Bundle.cpp; sourceTree = "<group>"; };
                                BC575944126E733C006F0F12 /* InjectedBundle */,
                                C0ADBE7A12FCA4D000D2C129 /* JavaScriptTest.cpp */,
                                C0ADBE7B12FCA4D000D2C129 /* JavaScriptTest.h */,
-                               BC131A9E1171317C00B69727 /* TestWebKitAPIPrefix.h */,
+                               BC131A9E1171317C00B69727 /* config.h */,
                                BC575BBF126F5752006F0F12 /* PlatformUtilities.cpp */,
                                BC131883117114A800B69727 /* PlatformUtilities.h */,
                                BC90951B125533D700083756 /* PlatformWebView.h */,
index 0ef6e556ab28bd92867e80f3d3d6012cf35c3dd9..768c7d3af3a7c08c69d9548c3ec67988d328f657 100644 (file)
@@ -23,7 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <JavaScriptCore/CheckedArithmetic.h>
+#include "config.h"
+#include <wtf/CheckedArithmetic.h>
 
 namespace TestWebKitAPI {
 
index 985964be747c25e4365862198f12e6b1b81012ef..819013fdbbdd0224d9253200f1da22322adbe7bd 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define JS_EXPORTDATA
+#include "config.h"
+
 #define WTF_STRINGTYPEADAPTER_COPIED_WTF_STRING() (++wtfStringCopyCount)
 
 static int wtfStringCopyCount;
 
-#include <JavaScriptCore/WTFString.h>
+#include <wtf/text/WTFString.h>
 
 namespace TestWebKitAPI {
 
index 946b60ce8ddffb2ab3654b207d84028489ee83c4..211ef8841accfd10aa10ceaa900d611a07875c51 100644 (file)
@@ -23,7 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <JavaScriptCore/Vector.h>
+#include "config.h"
+#include <wtf/Vector.h>
 
 namespace TestWebKitAPI {
 
index c9a0af0d1c9099637a5d12fada84b70966955692..6d4a00f0f324b87247b8b7d2e69bbf15c1b77061 100644 (file)
@@ -23,7 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <JavaScriptCore/Vector.h>
+#include "config.h"
+#include <wtf/Vector.h>
 
 namespace TestWebKitAPI {
 
index dd40ef2a8c10407a6c640ad2340821e9a6d7d7bd..ff36a0b185631ae6358e9832ab799c97fd3ba017 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 
index 80dc2dd5c77c1c97f9e0b24815ac4c708caccda6..8fbcf64f1fd9ec4d16160778c9c1c71ee8353d16 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include <WebKit2/WKContextPrivate.h>
index b5d644d17001f2c933ab7cd48a2d7887748a827e..5f66b537a17e8eaf3b01a438031652ef9a0b6066 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
index 57377e5223616f709a8e447be9de38e850e22c8d..df5fb2eb0d44beb20a06aa2da58c23b4b795ed88 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include <WebKit2/WKCookieManager.h>
index af4d25960249aaa24519aefa694ae2eaba6b046e..7559da28d351cb777b8cd284472d80b64af9c4f4 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
index fbda52ee45735e2368856a22f4ffc054dc36706f..3aa29098128e9f77f5cf8c5e9fb49a51397bd41b 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "InjectedBundleTest.h"
 #include <WebKit2/WKBundlePageGroup.h>
 #include <WebKit2/WKBundlePrivate.h>
index 3809331241d5b016f496ae4cf45e4217cf5414dc..f360646dd3258e71c3011a7947f4b6fd343ea0b1 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include <WebKit2/WKDownload.h>
index bcf5db4e502cad4cdad7a42ac9bed11972dc8bec..99b7ff7f157cc92f4fa2d2eb8eb474fc57ac4179 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
index 25fe10a9a6870fef09b2c1d93dd0389573a99fa9..99b1b97446f68324a95a876a96f05d78f323febc 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
index ae10fe0fc1987e21f4e2cf7458df1af0ecfa7f17..2717c13554721951a99a3522a28efe16d5f42fa6 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include <WebKit2/WKRetainPtr.h>
index 8fdeea259cc15352ffb0f7173f8792c42564f4ee..08873f843cdf1bb6f56d99b0dcbdc30cbd94ba65 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
index 2d296e48e76d895d783fe439dac157fb6515988a..7349866288a8fd5d56d4275d715dfff64bcf7039 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
index d1e15916e72aed712fc09184fe828d537ac21dca..46f63dae9034c26de003dc2df5bc7cb5772dbb6c 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include <WebKit2/WKRetainPtr.h>
index 0fc1a844ca9acbfd37f5b46dcffa785d93a82ad3..2100d28c35535df43901b9fc0ec273b5b9b22495 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include <WebKit2/WKRetainPtr.h>
index c40a7f648deda3c7c1e59d74fc607a063f6d064d..882909e819969684bfe21b2a1962d75364012ff6 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "InjectedBundleTest.h"
 #include "InjectedBundleController.h"
 #include "PlatformUtilities.h"
index 6234e10d06fe6b6de5e1a4dc45a62b64ce40fbef..40ca269dfe3f4e5618405ae1555d143e7aaf68f8 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include <WebKit2/WKRetainPtr.h>
index 1707640ee379e17bf0a8ee148c5524919808cf5e..6a597be41400f349b9d7e0f57b4363018fcfd0fc 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "InjectedBundleTest.h"
 #include <WebKit2/WKRetainPtr.h>
 
index 175968b349b7e06201471f162dad5b88aa35f835..7dbd063bc27411b81b2d4681724800ad28c78c70 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "JavaScriptTest.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
index ff2331dd023b956e66576acbd15c82522a2cba7f..0792c3f8a285dda6c968f0ae39a98990b53d860d 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "InjectedBundleTest.h"
 #include "PlatformUtilities.h"
 #include "Test.h"
index 779bf1588b5d99b183d931409b324937f2ec974c..c5e8514597fed5ef023467f365777f9d1fc990f7 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "JavaScriptTest.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
index 1e4b6ec28a8298563500f5429d3dbf7909203968..a075620932c5982c18f0baa29973cdd038251c8a 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
index c546c70b64db84412b4854291fefaa9dfcda3769..0191b6593dd652a013723c3acde4749fe1944729 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
index ea85bd75be3b6ce4436c45833d026b9e7b73630f..86fbe5ed6708bf7990ba862b78f988d48cc37524 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include <WebKit2/WKRetainPtr.h>
index dc94f0c0516775723748090e03174ea85926ecc9..4c522780dfe73c1a05e8e10d994e3506f83ac9cc 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
index 338704812cd092628b23dbd74ed40c93d35235f6..10f04c180d30dd8e09201296d3229357e0d771b7 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 
index f0ad0eaa5391d93712af639076cb6b510ad8e2b7..50d664f38b53e2bec3dcf3d2d3eeaf870b998564 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
index 209d534ce24f55ae61fa1c2b8d13ebcf481bfc25..f75de124e26330570926e1b0bd4ed6ca7451574b 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "JavaScriptTest.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
index 0a598c656fcff7aed09c32b83c3426f29221ebf8..f87da5878c244411bbc6cd372d5906dff7891fac 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "JavaScriptTest.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
index 513748604542cccc93447d0c4d6a87dad9faae16..8a0a7cfc5dcaef91421e1dc70a87a5e8c733d48a 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include <WebKit2/WKPreferencesPrivate.h>
 #include <WebKit2/WKRetainPtr.h>
index 2adba9bcb9052cb72c8089abe462dc99598e7dc8..b67235932ca114cc8ba1933bb65f5245c8ecce00 100644 (file)
@@ -23,6 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
+
 namespace TestWebKitAPI {
 
 TEST(WebKit2, WKString)
index 7eb60087a035f49e59c55b787c4a8118c179cd21..cdba57de4dee8b5687a20c09ef05775dc178bdcd 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include <WebKit2/WKStringPrivate.h>
 #include <JavaScriptCore/JSStringRef.h>
 
index 5a5e2d0b9a5598c6e7c77bc7e26c5dd6574b6cf7..000f9cdd0c026ddf00f71db18df8b9f80828ec24 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "WindowMessageObserver.h"
index 03e0914cf9d83459b366b17e179a97b7a596893f..8bd0c56780efd082cf5862b1fb9abcb3de5c36f2 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include <WebKit2/WKRetainPtr.h>
 #include <WebKit2/WKURLResponseCF.h>
 #include <wtf/RetainPtr.h>
index 64ce4eb35a437d3c6047059d5bf665a0338f6198..6e350ff811a21d3eb1ee615af1b7f1f84a5e8eef 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
index db5c3785d249888a9fd75c98b8c21c57945fa1e4..32c8a0762ea85567cf19d1a81d21d5451cbe17d3 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include <WebKit2/WKRetainPtr.h>
index 6b513a79d77b1af98a8057100b01e975f33413dc..844499cd6dab06896c66092b2af3c2b62e208b69 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "WindowMessageObserver.h"
index 7d10cb6f6774e466a2e9e7aa8a9522d5f0e3675b..5fa4b3a2ae311ffeb58def9ae7b210d243904173 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include <WebKit2/WKRetainPtr.h>
index 51c1540b25aa75ff5041860b61c9d7b7a4761337..36a18ca41ca84d8a16e6d0089754710094cf343a 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include <WebKit2/WKRetainPtr.h>
index 8d2715080539af239537e25bec555fefcece32d9..29dcc714e3e2acca0ef2c3d83adfc8f04d564cf1 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "TestsController.h"
 
 #include <wtf/Threading.h>
similarity index 97%
rename from Tools/TestWebKitAPI/TestWebKitAPIPrefix.h
rename to Tools/TestWebKitAPI/config.h
index c31528ed402caef8bbb7b305313a71f794930141..ffb4d9a50403fbb63d066ec306a444fe53ad7a9f 100644 (file)
 #define JS_EXPORT_PRIVATE
 #define WTF_EXPORT_PRIVATE
 
+#define JS_EXPORTDATA
+
 #include <stdint.h>
+
+#if !PLATFORM(CHROMIUM)
 #include <WebKit2/WebKit2.h>
+#endif
 
 #ifdef __cplusplus
 #include <gtest/gtest.h>
index 919627ea5eb3c5f09d7686b30824e617defd3a45..5c4f42d9b21b5acf9ca10eeb0a342fc3b68292f9 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "InjectedBundleController.h"
 
 namespace TestWebKitAPI {
index 90208c59139d403e40674ffae2b00e4bb6bdd628..1b9823d97a7aae0bfb8c81a158276cfeb4a9a6dd 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformUtilities.h"
 
 #include <WebKit2/WKStringCF.h>
index 292e38091cf670ea9327797178c29bd9ed31571f..2015f263432cacf2bbca41cf021b97ee49db5cdd 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "PlatformWebView.h"
 
 #include "WindowMessageObserver.h"
index aabb50fe13aeebd2aa0e06d0779694ab77a117e1..e1eb9c544a0bc9ac1c7e979b8f43ff9cad25ebf4 100644 (file)
                        >
                </File>
                <File
-                       RelativePath="..\TestWebKitAPIPrefix.h"
+                       RelativePath="..\config.h"
                        >
                </File>
        </Files>
index a75619794e17bd190edc4e5a881cdb4d8e15ac9f..b7211ea0b57ff09740de396b6c5d02460d4c413b 100644 (file)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "TestsController.h"
 
 int main(int argc, char** argv)