admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GN: Move xmllite_xmpp_unittests into webrtc/libjingle

Browse Source 
Moving one of the targets that shouldn't pollute the already large
webrtc/BUILD.gn file.

BUG=webrtc:6440
NOTRY=True

Review-Url: https://codereview.webrtc.org/2440963002
Cr-Commit-Position: refs/heads/master@{#14970}
This commit is contained in:
kjellander 2016-11-08 03:18:38 -08:00 committed by Commit bot
parent a92704e6f5
commit eee9c0e3ec
3 changed files with 61 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
webrtc/BUILD.gn
View File

@ -295,10 +295,10 @@ if (!build_with_chromium) {
":video_engine_tests",
":webrtc_nonparallel_tests",
":webrtc_perf_tests",
":xmllite_xmpp_unittests",
"api:peerconnection_unittests",
"common_audio:common_audio_unittests",
"common_video:common_video_unittests",
"libjingle:xmllite_xmpp_unittests",
"media:rtc_media_unittests",
"modules:modules_tests",
"modules:modules_unittests",
@ -575,46 +575,6 @@ if (rtc_include_tests) {
}
}
rtc_test("xmllite_xmpp_unittests") {
configs += [ ":rtc_unittests_config" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
deps = [
"base:rtc_base_tests_utils",
"libjingle/xmllite:rtc_xmllite",
"libjingle/xmpp:rtc_xmpp",
"//testing/gtest",
]
sources = [
"libjingle/xmllite/qname_unittest.cc",
"libjingle/xmllite/xmlbuilder_unittest.cc",
"libjingle/xmllite/xmlelement_unittest.cc",
"libjingle/xmllite/xmlnsstack_unittest.cc",
"libjingle/xmllite/xmlparser_unittest.cc",
"libjingle/xmllite/xmlprinter_unittest.cc",
"libjingle/xmpp/fakexmppclient.h",
"libjingle/xmpp/hangoutpubsubclient_unittest.cc",
"libjingle/xmpp/jid_unittest.cc",
"libjingle/xmpp/mucroomconfigtask_unittest.cc",
"libjingle/xmpp/mucroomdiscoverytask_unittest.cc",
"libjingle/xmpp/mucroomlookuptask_unittest.cc",
"libjingle/xmpp/mucroomuniquehangoutidtask_unittest.cc",
"libjingle/xmpp/pingtask_unittest.cc",
"libjingle/xmpp/pubsubclient_unittest.cc",
"libjingle/xmpp/pubsubtasks_unittest.cc",
"libjingle/xmpp/util_unittest.cc",
"libjingle/xmpp/util_unittest.h",
"libjingle/xmpp/xmppengine_unittest.cc",
"libjingle/xmpp/xmpplogintask_unittest.cc",
"libjingle/xmpp/xmppstanzaparser_unittest.cc",
]
}
# TODO(pbos): Rename test suite, this is no longer "just" for video targets.
video_engine_tests_resources = [
"//resources/foreman_cif_short.yuv",

2
webrtc/build/gn_isolate_map.pyl
View File

@ -96,7 +96,7 @@
"type": "console_test_launcher",
},
"xmllite_xmpp_unittests": {
"label": "//webrtc:xmllite_xmpp_unittests",
"label": "//webrtc/libjingle:xmllite_xmpp_unittests",
"type": "console_test_launcher",
}
}

59
webrtc/libjingle/BUILD.gn Normal file
View File

@ -0,0 +1,59 @@
# Copyright (c) 2016 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.
import("../build/webrtc.gni")
group("libjingle") {
public_deps = [
"xmllite",
"xmpp",
]
}
if (rtc_include_tests) {
rtc_test("xmllite_xmpp_unittests") {
configs += [ "..:rtc_unittests_config" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
deps = [
"../base:rtc_base_tests_utils",
"xmllite",
"xmpp",
"//testing/gtest",
]
sources = [
"xmllite/qname_unittest.cc",
"xmllite/xmlbuilder_unittest.cc",
"xmllite/xmlelement_unittest.cc",
"xmllite/xmlnsstack_unittest.cc",
"xmllite/xmlparser_unittest.cc",
"xmllite/xmlprinter_unittest.cc",
"xmpp/fakexmppclient.h",
"xmpp/hangoutpubsubclient_unittest.cc",
"xmpp/jid_unittest.cc",
"xmpp/mucroomconfigtask_unittest.cc",
"xmpp/mucroomdiscoverytask_unittest.cc",
"xmpp/mucroomlookuptask_unittest.cc",
"xmpp/mucroomuniquehangoutidtask_unittest.cc",
"xmpp/pingtask_unittest.cc",
"xmpp/pubsubclient_unittest.cc",
"xmpp/pubsubtasks_unittest.cc",
"xmpp/util_unittest.cc",
"xmpp/util_unittest.h",
"xmpp/xmppengine_unittest.cc",
"xmpp/xmpplogintask_unittest.cc",
"xmpp/xmppstanzaparser_unittest.cc",
]
}
}