Make cc_unittests and webkit_compositor_unittests executable always

webkit/compositor/compositor_tests.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 0,
     'use_libcc_for_compositor%': 0,
     'webkit_compositor_tests_sources': [
       'LayerChromiumTest.cpp',
       'TextureCopierTest.cpp',
       'TextureLayerChromiumTest.cpp',
       'ThrottledTextureUploaderTest.cpp',
       'TiledLayerChromiumTest.cpp',
       'TreeSynchronizerTest.cpp',
       'WebAnimationTest.cpp',
       'WebFloatAnimationCurveTest.cpp',
       'WebFloatAnimationCurveTest.cpp',
       'WebLayerTest.cpp',
       'WebLayerTreeViewTest.cpp',
       'WebTransformAnimationCurveTest.cpp',
       'WebTransformAnimationCurveTest.cpp',
       'WebTransformOperationsTest.cpp',
       'WebTransformationMatrixTest.cpp',
       'test/FakeWebScrollbarThemeGeometry.h',
       'test/WebLayerTreeViewTestCommon.h',
     ],
   },
-  'conditions': [
-    ['use_libcc_for_compositor==1 and component!="shared_library"', {
-      'targets': [
-        {
-          'target_name': 'webkit_compositor_unittests',
-          'type' : 'executable',
+  'targets': [
+    {
+      'target_name': 'webkit_compositor_unittests',

[nduca, 2012/08/31 23:16:49]

this target name is kinda bad.

webkit_unit_tests vs webkit_compsoitor_unittests --- these are tests of our
exports of the compositor to webkit, whereas the webkit 
to the webkit. Its gonna be confusing to tell people "test the webkit compositor
by runnign layout tests and webkit_unit_tests, but test the <this thing> by
running webkit_compositor_unittests.

does the word platform help here in some way?

+      'type' : 'executable',
+      'dependencies': [
+        '../../base/base.gyp:test_support_base',
+        '../../testing/gmock.gyp:gmock',
+        '../../testing/gtest.gyp:gtest',
+        '../../webkit/support/webkit_support.gyp:webkit_support',
+      ],
+      'sources': [
+        'test/run_all_unittests.cc',
+      ],
+      'conditions': [
+        ['use_libcc_for_compositor==1 and component!="shared_library"', {
           'dependencies': [
-            '../../base/base.gyp:test_support_base',
             '../../cc/cc.gyp:cc',
             '../../cc/cc_tests.gyp:cc_test_support',
             '../../skia/skia.gyp:skia',
-            '../../testing/gmock.gyp:gmock',
-            '../../testing/gtest.gyp:gtest',
             '../../third_party/WebKit/Source/Platform/Platform.gyp/Platform.gyp:webkit_platform',
             '../../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
-            '../../webkit/support/webkit_support.gyp:webkit_support',
             'compositor.gyp:webkit_compositor',
           ],
           'include_dirs': [
             '.',
             'test',
             '<(DEPTH)/cc',
             '<(DEPTH)/cc/stubs',
             '<(DEPTH)/cc/test',
           ],
           'sources': [
             '<@(webkit_compositor_tests_sources)',
-            'test/run_all_unittests.cc',
           ]
-        },
+        }],
       ],
-    }, {
-      'targets': [
-        {
-          'target_name': 'webkit_compositor_unittests',
-          'type' : 'none',
-        }
-      ],
-    }],
+    },
   ],
 }