From e829f58928eaae6bfcfe2cc090a51d326b70a29d Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Mon, 15 Feb 2016 09:36:31 +0100 Subject: [PATCH] Rename libjingle_p2p_unittest -> rtc_pc_unittests BUG=webrtc:5419 R=pthatcher@webrtc.org TBR=henrika@webrtc.org Review URL: https://codereview.webrtc.org/1694813002 . Cr-Commit-Position: refs/heads/master@{#11619} --- .../sanitizers/tsan_suppressions_webrtc.cc | 2 +- webrtc/libjingle_p2p_unittest.isolate | 40 ------------------- webrtc/pc/pc_tests.gypi | 4 +- webrtc/rtc_pc_unittests.isolate | 22 ++++++++++ webrtc/webrtc_tests.gypi | 6 +-- 5 files changed, 28 insertions(+), 46 deletions(-) delete mode 100644 webrtc/libjingle_p2p_unittest.isolate create mode 100644 webrtc/rtc_pc_unittests.isolate diff --git a/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc b/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc index 2bc1b277f0..00c950cf68 100644 --- a/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc +++ b/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc @@ -61,7 +61,7 @@ char kTSanDefaultSuppressions[] = "deadlock:rtc::MessageQueueManager::Clear\n" "deadlock:rtc::MessageQueueManager::ClearInternal\n" -// libjingle_p2p_unittest +// rtc_pc_unittests // https://code.google.com/p/webrtc/issues/detail?id=2079 "race:webrtc/base/testclient.cc\n" "race:webrtc/base/virtualsocketserver.cc\n" diff --git a/webrtc/libjingle_p2p_unittest.isolate b/webrtc/libjingle_p2p_unittest.isolate deleted file mode 100644 index 96575b30b3..0000000000 --- a/webrtc/libjingle_p2p_unittest.isolate +++ /dev/null @@ -1,40 +0,0 @@ -# -# libjingle -# Copyright 2013 Google Inc. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/libjingle_p2p_unittest<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(PRODUCT_DIR)/libjingle_p2p_unittest<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/pc/pc_tests.gypi b/webrtc/pc/pc_tests.gypi index 0245dde055..416fd2b5b1 100755 --- a/webrtc/pc/pc_tests.gypi +++ b/webrtc/pc/pc_tests.gypi @@ -10,7 +10,7 @@ 'includes': ['../build/common.gypi'], 'targets': [ { - 'target_name': 'libjingle_p2p_unittest', + 'target_name': 'rtc_pc_unittests', 'type': 'executable', 'dependencies': [ '<(webrtc_root)/api/api.gyp:libjingle_peerconnection', @@ -56,6 +56,6 @@ }, }], ], - }, # target libjingle_p2p_unittest + }, # target rtc_pc_unittests ], } diff --git a/webrtc/rtc_pc_unittests.isolate b/webrtc/rtc_pc_unittests.isolate new file mode 100644 index 0000000000..52d7e19dc3 --- /dev/null +++ b/webrtc/rtc_pc_unittests.isolate @@ -0,0 +1,22 @@ +# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +{ + 'conditions': [ + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/rtc_pc_unittests<(EXECUTABLE_SUFFIX)', + ], + 'files': [ + '<(PRODUCT_DIR)/rtc_pc_unittests<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ], +} diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi index 0c8b118b39..7b01ad1451 100644 --- a/webrtc/webrtc_tests.gypi +++ b/webrtc/webrtc_tests.gypi @@ -369,16 +369,16 @@ ], }, { - 'target_name': 'libjingle_p2p_unittest_run', + 'target_name': 'rtc_pc_unittests_run', 'type': 'none', 'dependencies': [ - 'libjingle_p2p_unittest', + 'rtc_pc_unittests', ], 'includes': [ 'build/isolate.gypi', ], 'sources': [ - 'libjingle_p2p_unittest.isolate', + 'rtc_pc_unittests.isolate', ], }, {