Changeset 95647 in webkit

Timestamp:

Sep 21, 2011 10:37:57 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Ensure TestWebKitAPI works on mac, win, chromium-mac and chromium-linux
​https://bugs.webkit.org/show_bug.cgi?id=68206

Patch by Xianzhu Wang <​wangxianzhu@chromium.org> on 2011-09-21
Reviewed by Tony Chang.

Source/WebCore:

Added two new wtf headers into ForwardingHeaders/wtf to make
#include <wtf/...h> cross-platform.
No new tests needed.

• ForwardingHeaders/wtf/MetaAllocator.h: Added.
• ForwardingHeaders/wtf/RedBlackTree.h: Added.

Source/WebKit/chromium:

• WebKit.gyp:

Tools:

• Scripts/webkitdirs.pm:

(determineBaseProductDir): add support for chromium-mac

• TestWebKitAPI/Tests/WTF/MetaAllocator.cpp:
• TestWebKitAPI/Tests/WTF/RedBlackTree.cpp:

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/ForwardingHeaders/wtf/MetaAllocator.h (added)
• Source/WebCore/ForwardingHeaders/wtf/RedBlackTree.h (added)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/WebKit.gyp (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitdirs.pm (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.gypi (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/RedBlackTree.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-21  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        Ensure TestWebKitAPI works on mac, win, chromium-mac and chromium-linux
+        https://bugs.webkit.org/show_bug.cgi?id=68206
+
+        Reviewed by Tony Chang.
+
+        Added two new wtf headers into ForwardingHeaders/wtf to make
+        #include <wtf/...h> cross-platform.
+        No new tests needed.
+
+        * ForwardingHeaders/wtf/MetaAllocator.h: Added.
+        * ForwardingHeaders/wtf/RedBlackTree.h: Added.
+
 2011-09-21  David Delaune  <david.delaune@googlemail.com>
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-09-21  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        Ensure TestWebKitAPI works on mac, win, chromium-mac and chromium-linux
+        https://bugs.webkit.org/show_bug.cgi?id=68206
+
+        Reviewed by Tony Chang.
+
+        * WebKit.gyp:
+
 2011-09-21  chandra shekar vallala  <chandra.vallala@gmail.com>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -33 +33 @@
         '../../WebCore/WebCore.gypi',
         '../../../Tools/DumpRenderTree/DumpRenderTree.gypi',
+        '../../../Tools/TestWebKitAPI/TestWebKitAPI.gypi',
         'WebKit.gypi',
         'features.gypi',
@@ -1179 +1180 @@
                     ]
                 }],
-                ['component!="shared_library"', {
+                ['inside_chromium_build==0 or component!="shared_library"', {
                     'dependencies': [
                         '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_test_support',
@@ -1267 +1268 @@
                         'files': ['<(PRODUCT_DIR)/libTestNetscapePlugIn.so'],
                     }],
+                }],
+            ],
+        },
+        {
+            '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',
+                # Needed by tests/RunAllTests.cpp, as well as ChromiumCurrentTime.cpp and
+                # ChromiumThreading.cpp in chromium shared library configuration.
+                'public',
+            ],
+            'sources': [
+                # Reuse the same testing driver of Chromium's webkit_unit_tests.
+                'tests/RunAllTests.cpp',
+                '<@(TestWebKitAPI_files)',
+            ],
+            'conditions': [
+                ['inside_chromium_build==1 and component=="shared_library"', {
+                    'sources': [
+                        # To satisfy linking of WTF::currentTime() etc. in shared library configuration,
+                        # as the symbols are not exported from the DLLs.
+                        'src/ChromiumCurrentTime.cpp',
+                        'src/ChromiumThreading.cpp',
+                    ],
                 }],
             ],

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-21  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        Ensure TestWebKitAPI works on mac, win, chromium-mac and chromium-linux
+        https://bugs.webkit.org/show_bug.cgi?id=68206
+
+        Reviewed by Tony Chang.
+
+        * Scripts/webkitdirs.pm:
+        (determineBaseProductDir): add support for chromium-mac
+        * TestWebKitAPI/Tests/WTF/MetaAllocator.cpp:
+        * TestWebKitAPI/Tests/WTF/RedBlackTree.cpp:
+
 2011-09-21  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -157 +157 @@
         $baseProductDir = $sourceDir;
     } elsif (isChromium()) {
-        $baseProductDir = "$sourceDir/out";
+        if (isLinux() || isChromiumAndroid()) {
+            $baseProductDir = "$sourceDir/out";
+        } elsif (isDarwin()) {
+            $baseProductDir = "$sourceDir/Source/WebKit/chromium/xcodebuild";
+        } elsif (isWindows() || isCygwin()) {
+            # FIXME: set the correct baseProductDir for chromium-win.
+        }
     }
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.gypi

@@ -33 +33 @@
         'TestWebKitAPI_files': [
             'Tests/WTF/CheckedArithmeticOperations.cpp',
+            'Tests/WTF/RedBlackTree.cpp',
             'Tests/WTF/StringOperators.cpp',
             'Tests/WTF/VectorBasic.cpp',

trunk/Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp

@@ -28 +28 @@
 
 #include "config.h"
-#include <JavaScriptCore/MetaAllocator.h>
-#include <JavaScriptCore/Vector.h>
+#include <stdarg.h>
+#include <wtf/MetaAllocator.h>
+#include <wtf/Vector.h>
 
 using namespace WTF;

trunk/Tools/TestWebKitAPI/Tests/WTF/RedBlackTree.cpp

@@ -28 +28 @@
 
 #include "config.h"
-#include <JavaScriptCore/RedBlackTree.h>
-#include <JavaScriptCore/Vector.h>
+#include <wtf/RedBlackTree.h>
+#include <wtf/Vector.h>
 
 using namespace WTF;