Make cc_unittests and webkit_compositor_unittests executable always

To get these tests set up to run on the bots they need to be executables always.
If use_libcc_for_compositor is 0 these targets won't run any tests, but they will
still successfully run.

TBR=joth@chromium.org (for stupid android_webview copyright script)
BUG=

Review URL: https://chromiumcodereview.appspot.com/10920056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154620 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 30 insertions, 19 deletions

diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index ac2520e..faaffc6 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -63,25 +63,31 @@
       'test/MockCCQuadCuller.h',
     ],
   },
-  'conditions': [
-    ['use_libcc_for_compositor==1 and component!="shared_library"', {
-      'targets': [
-        {
-          'target_name': 'cc_unittests',
-          'type': 'executable',
+  'targets': [
+    {
+      'target_name': 'cc_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:test_support_base',
+        '../testing/gtest.gyp:gtest',
+        '../testing/gmock.gyp:gmock',
+      ],
+      'sources': [
+        'test/run_all_unittests.cc',
+      ],
+      'conditions': [
+        ['use_libcc_for_compositor==1 and component!="shared_library"', {
           'dependencies': [
-            '../base/base.gyp:test_support_base',
-            '../testing/gtest.gyp:gtest',
-            '../testing/gmock.gyp:gmock',
-            '../webkit/support/webkit_support.gyp:webkit_support',
             '../skia/skia.gyp:skia',
             # We have to depend on WTF directly to pick up the correct defines for WTF headers - for instance USE_SYSTEM_MALLOC.
             '../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
             '../third_party/WebKit/Source/Platform/Platform.gyp/Platform.gyp:webkit_platform',
+            '../webkit/support/webkit_support.gyp:webkit_support',
             'cc.gyp:cc',
             'cc_test_support',
           ],
           'defines': [
+            'USE_LIBCC_FOR_COMPOSITOR',
             'WTF_USE_ACCELERATED_COMPOSITING=1',
           ],
           'include_dirs': [
@@ -91,9 +97,14 @@
           ],
           'sources': [
             '<@(cc_tests_source_files)',
-            'test/run_all_unittests.cc',
           ],
-        },
+        }],
+      ],
+    },
+  ],
+  'conditions': [
+    ['use_libcc_for_compositor==1 and component!="shared_library"', {
+      'targets': [
         {
           'target_name': 'cc_test_support',
           'type': 'static_library',
@@ -119,13 +130,6 @@
           ],
         },
       ],
-    }, {
-      'targets': [
-        {
-          'target_name': 'cc_unittests',
-          'type': 'none',
-        }
-      ]
     }],
   ],
 }
diff --git a/cc/test/run_all_unittests.cc b/cc/test/run_all_unittests.cc
index de5b1c6..d6c4ba0 100644
--- a/cc/test/run_all_unittests.cc
+++ b/cc/test/run_all_unittests.cc
@@ -4,14 +4,21 @@
 
 #include <base/test/test_suite.h>
 #include <gmock/gmock.h>
+
+#if defined(USE_LIBCC_FOR_COMPOSITOR)
 #include <webkit/support/webkit_support.h>
+#endif
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleMock(&argc, argv);
   TestSuite testSuite(argc, argv);
+#if defined(USE_LIBCC_FOR_COMPOSITOR)
   webkit_support::SetUpTestEnvironmentForUnitTests();
+#endif
   int result = testSuite.Run();
+#if defined(USE_LIBCC_FOR_COMPOSITOR)
   webkit_support::TearDownTestEnvironment();
+#endif
 
   return result;
 }