Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license |
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source |
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found |
| 6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may |
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. |
| 8 { | 8 { |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 463 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', | 463 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', |
| 464 ], | 464 ], |
| 465 }], | 465 }], |
| 466 ], | 466 ], |
| 467 }, | 467 }, |
| 468 { | 468 { |
| 469 'target_name': 'webrtc_nonparallel_tests', | 469 'target_name': 'webrtc_nonparallel_tests', |
| 470 'type': '<(gtest_target_type)', | 470 'type': '<(gtest_target_type)', |
| 471 'sources': [ | 471 'sources': [ |
| 472 'base/nullsocketserver_unittest.cc', | 472 'base/nullsocketserver_unittest.cc', |
| 473 'base/physicalsocketserver_unittest.cc', | |
| 474 'base/socket_unittest.cc', | |
| 475 'base/socket_unittest.h', | |
| 476 'base/socketaddress_unittest.cc', | 473 'base/socketaddress_unittest.cc', |
| 477 'base/virtualsocket_unittest.cc', | 474 'base/virtualsocket_unittest.cc', |
| 478 ], | 475 ], |
| 479 'defines': [ | 476 'defines': [ |
| 480 'GTEST_RELATIVE_PATH', | 477 'GTEST_RELATIVE_PATH', |
| 481 ], | 478 ], |
| 482 'dependencies': [ | 479 'dependencies': [ |
| 483 '<(DEPTH)/testing/gtest.gyp:gtest', | 480 '<(DEPTH)/testing/gtest.gyp:gtest', |
| 484 'base/base.gyp:rtc_base', | 481 'base/base.gyp:rtc_base', |
| 485 'test/test.gyp:test_main', | 482 'test/test.gyp:test_main', |
| 486 ], | 483 ], |
| 487 'conditions': [ | 484 'conditions': [ |
| 488 ['OS=="android"', { | 485 ['OS=="android"', { |
| 489 'dependencies': [ | 486 'dependencies': [ |
| 490 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', | 487 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', |
| 491 ], | 488 ], |
| 492 }], | 489 }], |
| 493 ['OS=="win"', { | 490 ['OS=="win"', { |
| 494 'sources': [ | 491 'sources': [ |
| 495 'base/win32socketserver_unittest.cc', | 492 # TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot |
| 493 # then reenable these tests. | |
| 494 # 'base/win32socketserver_unittest.cc', | |
| 496 ], | 495 ], |
| 497 'sources!': [ | 496 }], |
|
kjellander_webrtc
2016/08/01 19:37:32
Replace line 496-497 with:
}, {
danilchap
2016/08/02 07:49:37
Done.
| |
| 498 # TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot | 497 ['OS!="win"', { |
| 499 # then reenable these tests. | 498 # TODO(pbos): Move test disabling to ifdefs within the test files |
| 500 # TODO(pbos): Move test disabling to ifdefs within the test files | 499 # instead of here. |
| 501 # instead of here. | 500 'sources': [ |
| 502 'base/physicalsocketserver_unittest.cc', | 501 'base/physicalsocketserver_unittest.cc', |
| 503 'base/socket_unittest.cc', | 502 'base/socket_unittest.cc', |
| 504 'base/win32socketserver_unittest.cc', | 503 'base/socket_unittest.h', |
| 505 ], | 504 ], |
| 506 }], | 505 }], |
| 507 ['OS=="mac"', { | 506 ['OS=="mac"', { |
| 508 'sources': [ | 507 'sources': [ |
| 509 'base/macsocketserver_unittest.cc', | 508 'base/macsocketserver_unittest.cc', |
| 510 ], | 509 ], |
| 511 }], | 510 }], |
| 512 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { | 511 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { |
| 513 'defines': [ | 512 'defines': [ |
| 514 'CARBON_DEPRECATED=YES', | 513 'CARBON_DEPRECATED=YES', |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 668 'build/isolate.gypi', | 667 'build/isolate.gypi', |
| 669 ], | 668 ], |
| 670 'sources': [ | 669 'sources': [ |
| 671 'webrtc_perf_tests.isolate', | 670 'webrtc_perf_tests.isolate', |
| 672 ], | 671 ], |
| 673 }, | 672 }, |
| 674 ], | 673 ], |
| 675 }], | 674 }], |
| 676 ], | 675 ], |
| 677 } | 676 } |
| OLD | NEW |