Changeset 84953 in webkit

Timestamp:

Apr 26, 2011 2:12:44 PM (13 years ago)

Author:

evan@chromium.org

Message:

2011-04-26 Evan Martin <​evan@chromium.org>

Reviewed by Tony Chang.

[chromium] refactor duplicated list of test source files
​https://bugs.webkit.org/show_bug.cgi?id=59478

The platform-specific unit test files were listed twice in
WebKit.gyp: once for the components build, once for the normal
build. Refactor this into the unified webkit_unittest_files
variable. (It appears the omission of WebPageSerializerTest
in one instance was an oversight.)

• WebKit.gyp:
• WebKit.gypi:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (2 diffs)
• WebKit.gypi (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-26  Evan Martin  <evan@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium] refactor duplicated list of test source files
+        https://bugs.webkit.org/show_bug.cgi?id=59478
+
+        The platform-specific unit test files were listed twice in
+        WebKit.gyp: once for the components build, once for the normal
+        build.  Refactor this into the unified webkit_unittest_files
+        variable.  (It appears the omission of WebPageSerializerTest
+        in one instance was an oversight.)
+
+        * WebKit.gyp:
+        * WebKit.gypi:
+
 2011-04-26  Robert Sesek  <rsesek@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -630 +630 @@
                             'sources': [
                                 '<@(webkit_unittest_files)',
-                                'tests/PopupMenuTest.cpp',
-                                'tests/TransparencyWinTest.cpp',
-                                'tests/UniscribeHelperTest.cpp',
-                                'tests/WebUnitTests.cpp'
+                                'tests/WebUnitTests.cpp',   # Components test runner support.
                             ],
                             'sources!' : [
-                                # We should not include files dpending on webkit_support.
+                                # We should not include files depending on webkit_support.
                                 'tests/CCThreadTest.cpp',
                                 # WebFrameTest.cpp depends on webkit_support and
@@ -845 +842 @@
                     ],
                     'conditions': [
-                        ['OS=="win"', {
-                            'sources': [
-                                # FIXME: Port PopupMenuTest to Linux and Mac.
-                                'tests/PopupMenuTest.cpp',
-                                'tests/TransparencyWinTest.cpp',
-                                'tests/UniscribeHelperTest.cpp',
-                                'tests/WebPageSerializerTest.cpp',
-                            ],
-                        }],
-                        ['OS=="mac"', {
-                            'sources!': [
-                                # FIXME: Port DragImageTest to Mac.
-                                'tests/DragImageTest.cpp',
-                            ],
-                        }],
                         ['OS=="linux" or OS=="freebsd"', {
-                            'sources': [
-                                'tests/WebInputEventFactoryTestGtk.cpp',
-                            ],
                             'include_dirs': [
                                 'public/gtk',

trunk/Source/WebKit/chromium/WebKit.gypi

@@ -69 +69 @@
             'tests/WebFrameTest.cpp',
         ],
+
+        'conditions': [
+            ['OS=="win"', {
+                'webkit_unittest_files': [
+                    # FIXME: Port DragImageTest to Mac.
+                    'tests/DragImageTest.cpp',
+                    # FIXME: Port PopupMenuTest to Linux and Mac.
+                    'tests/PopupMenuTest.cpp',
+                    'tests/TransparencyWinTest.cpp',
+                    'tests/UniscribeHelperTest.cpp',
+                    'tests/WebPageSerializerTest.cpp',
+                ],
+            }],
+            ['OS=="linux" or OS=="freebsd"', {
+                'webkit_unittest_files': [
+                    # FIXME: Port DragImageTest to Mac.
+                    'tests/DragImageTest.cpp',
+                    'tests/WebInputEventFactoryTestGtk.cpp',
+                ],
+            }],
+        ],
     },
 }