X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2Fwebrtc%2Fbase%2Fbase_tests.gyp;h=2d99e810c16c9080cd1190c1d1c3e0b4cf542320;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=3cef102855b9a36a2b6bfd420fd597ac1ccd4c33;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/webrtc/base/base_tests.gyp b/src/third_party/webrtc/base/base_tests.gyp
index 3cef102..2d99e81 100644
--- a/src/third_party/webrtc/base/base_tests.gyp
+++ b/src/third_party/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',
@@ -25,136 +25,142 @@
         'testutils.h',
         'win32toolhelp.h',
       ],
+      'defines': [
+        'GTEST_RELATIVE_PATH',
+      ],
       'dependencies': [
-        'base.gyp:webrtc_base',
+        'base.gyp:rtc_base',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
+      'direct_dependent_settings': {
+        'defines': [
+          'GTEST_RELATIVE_PATH',
+        ],
+      },
       'export_dependent_settings': [
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
     },
     {
-      'target_name': 'webrtc_base_tests',
-      'type': 'executable',
-      'dependencies': [
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-        'base.gyp:webrtc_base',
-        'webrtc_base_tests_utils',
-      ],
-      'sources': [
-        'asynchttprequest_unittest.cc',
-        'atomicops_unittest.cc',
-        'autodetectproxy_unittest.cc',
-        'bandwidthsmoother_unittest.cc',
-        'base64_unittest.cc',
-        'basictypes_unittest.cc',
-        'bind_unittest.cc',
-        'buffer_unittest.cc',
-        'bytebuffer_unittest.cc',
-        'byteorder_unittest.cc',
-        'callback_unittest.cc',
-        'cpumonitor_unittest.cc',
-        'crc32_unittest.cc',
-        'criticalsection_unittest.cc',
-        'event_unittest.cc',
-        'exp_filter_unittest.cc',
-        'filelock_unittest.cc',
-        'fileutils_unittest.cc',
-        'helpers_unittest.cc',
-        'httpbase_unittest.cc',
-        'httpcommon_unittest.cc',
-        'httpserver_unittest.cc',
-        'ipaddress_unittest.cc',
-        'logging_unittest.cc',
-        'md5digest_unittest.cc',
-        'messagedigest_unittest.cc',
-        'messagequeue_unittest.cc',
-        'multipart_unittest.cc',
-        'nat_unittest.cc',
-        'network_unittest.cc',
-        'nullsocketserver_unittest.cc',
-        'optionsfile_unittest.cc',
-        'pathutils_unittest.cc',
-        'physicalsocketserver_unittest.cc',
-        'profiler_unittest.cc',
-        'proxy_unittest.cc',
-        'proxydetect_unittest.cc',
-        'ratelimiter_unittest.cc',
-        'ratetracker_unittest.cc',
-        'referencecountedsingletonfactory_unittest.cc',
-        'rollingaccumulator_unittest.cc',
-        'scopedptrcollection_unittest.cc',
-        'sha1digest_unittest.cc',
-        'sharedexclusivelock_unittest.cc',
-        'signalthread_unittest.cc',
-        'sigslot_unittest.cc',
-        'sigslottester.h',
-        'sigslottester.h.pump',
-        'socket_unittest.cc',
-        'socket_unittest.h',
-        'socketaddress_unittest.cc',
-        'stream_unittest.cc',
-        'stringencode_unittest.cc',
-        'stringutils_unittest.cc',
-        # TODO(ronghuawu): Reenable this test.
-        # 'systeminfo_unittest.cc',
-        'task_unittest.cc',
-        'testclient_unittest.cc',
-        'thread_checker_unittest.cc',
-        'thread_unittest.cc',
-        'timeutils_unittest.cc',
-        'urlencode_unittest.cc',
-        'versionparsing_unittest.cc',
-        'virtualsocket_unittest.cc',
-        # TODO(ronghuawu): Reenable this test.
-        # 'windowpicker_unittest.cc',
-      ],
-      'conditions': [
-        ['OS=="linux"', {
-          'sources': [
-            'latebindingsymboltable_unittest.cc',
-            # TODO(ronghuawu): Reenable this test.
-            # 'linux_unittest.cc',
-            'linuxfdwalk_unittest.cc',
-          ],
-        }],
-        ['OS=="win"', {
-          'sources': [
-            'win32_unittest.cc',
-            'win32regkey_unittest.cc',
-            'win32socketserver_unittest.cc',
-            'win32toolhelp_unittest.cc',
-            'win32window_unittest.cc',
-            'win32windowpicker_unittest.cc',
-            'winfirewall_unittest.cc',
-          ],
-          'sources!': [
-            # TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot
-            # then reenable these tests.
-            'physicalsocketserver_unittest.cc',
-            'socket_unittest.cc',
-            'win32socketserver_unittest.cc',
-            'win32windowpicker_unittest.cc',
-          ],
-        }],
-        ['OS=="mac"', {
-          'sources': [
-            'macsocketserver_unittest.cc',
-            'macutils_unittest.cc',
-          ],
-        }],
-        ['os_posix==1', {
-          'sources': [
-            'sslidentity_unittest.cc',
-            'sslstreamadapter_unittest.cc',
-          ],
-        }],
-        ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
-          'defines': [
-            'CARBON_DEPRECATED=YES',
-          ],
-        }],
-      ],  # conditions
+      'target_name': 'rtc_base_tests',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'sources': [
+          'asynchttprequest_unittest.cc',
+          #'atomicops_unittest.cc',
+          #'autodetectproxy_unittest.cc',
+          #'bandwidthsmoother_unittest.cc',
+          #'base64_unittest.cc',
+          #'basictypes_unittest.cc',
+          #'bind_unittest.cc',
+          #'buffer_unittest.cc',
+          #'bytebuffer_unittest.cc',
+          #'byteorder_unittest.cc',
+          #'callback_unittest.cc',
+          #'cpumonitor_unittest.cc',
+          #'crc32_unittest.cc',
+          #'criticalsection_unittest.cc',
+          #'event_unittest.cc',
+          #'exp_filter_unittest.cc',
+          #'filelock_unittest.cc',
+          #'fileutils_unittest.cc',
+          #'helpers_unittest.cc',
+          #'httpbase_unittest.cc',
+          #'httpcommon_unittest.cc',
+          #'httpserver_unittest.cc',
+          #'ipaddress_unittest.cc',
+          #'logging_unittest.cc',
+          #'md5digest_unittest.cc',
+          #'messagedigest_unittest.cc',
+          #'messagequeue_unittest.cc',
+          #'multipart_unittest.cc',
+          #'nat_unittest.cc',
+          #'network_unittest.cc',
+          #'nullsocketserver_unittest.cc',
+          #'optionsfile_unittest.cc',
+          #'pathutils_unittest.cc',
+          #'physicalsocketserver_unittest.cc',
+          #'profiler_unittest.cc',
+          #'proxy_unittest.cc',
+          #'proxydetect_unittest.cc',
+          #'ratelimiter_unittest.cc',
+          #'ratetracker_unittest.cc',
+          #'referencecountedsingletonfactory_unittest.cc',
+          #'rollingaccumulator_unittest.cc',
+          #'scopedptrcollection_unittest.cc',
+          #'sha1digest_unittest.cc',
+          #'sharedexclusivelock_unittest.cc',
+          #'signalthread_unittest.cc',
+          #'sigslot_unittest.cc',
+          #'sigslottester.h',
+          #'sigslottester.h.pump',
+          #'socket_unittest.cc',
+          #'socket_unittest.h',
+          #'socketaddress_unittest.cc',
+          #'stream_unittest.cc',
+          #'stringencode_unittest.cc',
+          #'stringutils_unittest.cc',
+          # TODO(ronghuawu): Reenable this test.
+          # 'systeminfo_unittest.cc',
+          #'task_unittest.cc',
+          #'testclient_unittest.cc',
+          'thread_checker_unittest.cc',
+          #'thread_unittest.cc',
+          #'timeutils_unittest.cc',
+          #'urlencode_unittest.cc',
+          #'versionparsing_unittest.cc',
+          #'virtualsocket_unittest.cc',
+          # TODO(ronghuawu): Reenable this test.
+          # 'windowpicker_unittest.cc',
+        ],
+        'conditions': [
+          ['OS=="linux"', {
+            'sources': [
+              #'latebindingsymboltable_unittest.cc',
+              # TODO(ronghuawu): Reenable this test.
+              # 'linux_unittest.cc',
+              #'linuxfdwalk_unittest.cc',
+            ],
+          }],
+          ['OS=="win"', {
+            'sources': [
+              #'win32_unittest.cc',
+              #'win32regkey_unittest.cc',
+              #'win32socketserver_unittest.cc',
+              #'win32toolhelp_unittest.cc',
+              #'win32window_unittest.cc',
+              #'win32windowpicker_unittest.cc',
+              #'winfirewall_unittest.cc',
+            ],
+            'sources!': [
+              # TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot
+              # then reenable these tests.
+              #'physicalsocketserver_unittest.cc',
+              #'socket_unittest.cc',
+              #'win32socketserver_unittest.cc',
+              #'win32windowpicker_unittest.cc',
+            ],
+          }],
+          ['OS=="mac"', {
+            'sources': [
+              #'macsocketserver_unittest.cc',
+              #'macutils_unittest.cc',
+            ],
+          }],
+          ['os_posix==1', {
+            'sources': [
+              #'ssladapter_unittest.cc',
+              #'sslidentity_unittest.cc',
+              #'sslstreamadapter_unittest.cc',
+            ],
+          }],
+          ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
+            'defines': [
+              'CARBON_DEPRECATED=YES',
+            ],
+          }],
+        ],  # conditions
+      },
     },
   ],
 }