Put base tests in webrtc_tests.gyp

BUG=N/A
R=andrew@webrtc.org, pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14249004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7140 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/libjingle.gyp

@@ -303,7 +303,7 @@
       'dependencies': [
         '<(DEPTH)/third_party/expat/expat.gyp:expat',
         '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-        '<(webrtc_root)/base/base.gyp:webrtc_base',
+        '<(webrtc_root)/base/base.gyp:rtc_base',
       ],
       'export_dependent_settings': [
         '<(DEPTH)/third_party/expat/expat.gyp:expat',

talk/libjingle_tests.gyp

@@ -33,7 +33,7 @@
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
-        '<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils',
+        '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
         '<@(libjingle_tests_additional_deps)',
       ],
       'direct_dependent_settings': {
@@ -74,8 +74,8 @@
       'type': 'executable',
       'includes': [ 'build/ios_tests.gypi', ],
       'dependencies': [
-        '<(webrtc_root)/base/base.gyp:webrtc_base',
+        '<(webrtc_root)/base/base.gyp:rtc_base',
-        '<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils',
+        '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
         'libjingle.gyp:libjingle',
         'libjingle_unittest_main',
       ],
@@ -107,7 +107,7 @@
       'target_name': 'libjingle_sound_unittest',
       'type': 'executable',
       'dependencies': [
-        '<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils',
+        '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
         'libjingle.gyp:libjingle_sound',
         'libjingle_unittest_main',
       ],
@@ -119,7 +119,7 @@
       'target_name': 'libjingle_media_unittest',
       'type': 'executable',
       'dependencies': [
-        '<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils',
+        '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
         'libjingle.gyp:libjingle_media',
         'libjingle_unittest_main',
       ],
@@ -193,7 +193,7 @@
       'type': 'executable',
       'dependencies': [
         '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
-        '<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils',
+        '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
         'libjingle.gyp:libjingle',
         'libjingle.gyp:libjingle_p2p',
         'libjingle_unittest_main',
@@ -252,7 +252,7 @@
       'type': 'executable',
       'dependencies': [
         '<(DEPTH)/testing/gmock.gyp:gmock',
-        '<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils',
+        '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
         'libjingle.gyp:libjingle',
         'libjingle.gyp:libjingle_p2p',
         'libjingle.gyp:libjingle_peerconnection',
@@ -385,7 +385,7 @@
           'type': 'executable',
           'includes': [ 'build/ios_tests.gypi', ],
           'dependencies': [
-            '<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils',
+            '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
             'libjingle.gyp:libjingle_peerconnection_objc',
           ],
           'sources': [

webrtc/base/base.gyp

@@ -25,7 +25,7 @@
   ],
   'targets': [
     {
-      'target_name': 'webrtc_base',
+      'target_name': 'rtc_base',
       'type': 'static_library',
       'defines': [
         'FEATURE_ENABLE_SSL',
@@ -316,7 +316,7 @@
         '../overrides/webrtc/base/logging.h',
         '../overrides/webrtc/base/win32socketinit.cc',
       ],
-      # TODO(henrike): issue 3307, make webrtc_base build without disabling
+      # TODO(henrike): issue 3307, make rtc_base build without disabling
       # these flags.
       'cflags!': [
         '-Wextra',

webrtc/base/base_tests.gyp

@@ -9,7 +9,7 @@
   'includes': [ '../build/common.gypi', ],
   'targets': [
     {
-      'target_name': 'webrtc_base_tests_utils',
+      'target_name': 'rtc_base_tests_utils',
       'type': 'static_library',
       'sources': [
         'unittest_main.cc',
@@ -29,7 +29,7 @@
         'GTEST_RELATIVE_PATH',
       ],
       'dependencies': [
-        'base.gyp:webrtc_base',
+        'base.gyp:rtc_base',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
       'direct_dependent_settings': {
@@ -42,13 +42,9 @@
       ],
     },
     {
-      'target_name': 'webrtc_base_tests',
+      'target_name': 'rtc_base_tests',
-      'type': 'executable',
+      'type': 'none',
-      'dependencies': [
+      'direct_dependent_settings': {
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-        'base.gyp:webrtc_base',
-        'webrtc_base_tests_utils',
-      ],
         'sources': [
           'asynchttprequest_unittest.cc',
           'atomicops_unittest.cc',
@@ -164,5 +160,6 @@
           }],
         ],  # conditions
       },
+    },
   ],
 }

webrtc/libjingle/xmllite/xmllite.gyp

@@ -13,7 +13,7 @@
       'target_name': 'rtc_xmllite',
       'type': 'static_library',
       'dependencies': [
-        '<(webrtc_root)/base/base.gyp:webrtc_base',
+        '<(webrtc_root)/base/base.gyp:rtc_base',
         '<(DEPTH)/third_party/expat/expat.gyp:expat',
       ],
       'export_dependent_settings': [

webrtc/libjingle/xmllite/xmllite_tests.gyp

@@ -14,7 +14,7 @@
       'type': 'executable',
       'dependencies': [
         '<(DEPTH)/testing/gtest.gyp:gtest',
-        '<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils',
+        '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
         'xmllite.gyp:rtc_xmllite',
       ],
       'cflags_cc!': [

webrtc/sound/sound.gyp

@@ -13,7 +13,7 @@
       'target_name': 'rtc_sound',
       'type': 'static_library',
       'dependencies': [
-        '<(webrtc_root)/base/base.gyp:webrtc_base',
+        '<(webrtc_root)/base/base.gyp:rtc_base',
       ],
       'sources': [
         'automaticallychosensoundsystem.h',

webrtc/sound/sound_tests.gyp

@@ -14,7 +14,7 @@
       'type': 'executable',
       'dependencies': [
         '<(DEPTH)/testing/gtest.gyp:gtest',
-        '<(webrtc_root)/base/base_tests.gyp:webrtc_base_tests_utils',
+        '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
         '<(webrtc_root)/sound/sound.gyp:rtc_sound',
       ],
       'cflags_cc!': [

webrtc/system_wrappers/source/system_wrappers.gyp

@@ -17,7 +17,7 @@
         '../interface',
       ],
       'dependencies': [
-        '../../base/base.gyp:webrtc_base',
+        '../../base/base.gyp:rtc_base',
       ],
       'direct_dependent_settings': {
         'include_dirs': [

webrtc/webrtc.gyp

@@ -43,7 +43,6 @@
       'conditions': [
         ['include_tests==1', {
           'dependencies': [
-            'base/base_tests.gyp:*',
             'common_video/common_video_unittests.gyp:*',
             'libjingle/xmllite/xmllite_tests.gyp:*',
             'sound/sound_tests.gyp:*',
@@ -53,6 +52,7 @@
             'test/webrtc_test_common.gyp:webrtc_test_common_unittests',
             'tools/tools.gyp:*',
             'webrtc_tests',
+            'rtc_unittests',
           ],
         }],
       ],

webrtc/webrtc_tests.gypi

@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'targets': [
+    {
+      'target_name': 'rtc_unittests',
+      'type': 'executable',
+      'dependencies': [
+        'base/base.gyp:rtc_base',
+        'base/base_tests.gyp:rtc_base_tests_utils',
+        'base/base_tests.gyp:rtc_base_tests',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+      ],
+    },
     {
       'target_name': 'webrtc_tests',
       'type': 'none',