generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moves xmllite's unittests to rtc_unittest.

Browse Source 
BUG=3836
R=andrew@webrtc.org, kjellander@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7369 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2014-10-02 18:43:47 +00:00
parent 25cc745d6b
commit 31b75eae05
4 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/libjingle/xmllite/xmlelement_unittest.cc
View File

@ -15,6 +15,7 @@
#include "webrtc/base/common.h" #include "webrtc/base/common.h"
#include "webrtc/base/gunit.h" #include "webrtc/base/gunit.h"
#include "webrtc/base/thread.h" #include "webrtc/base/thread.h"
#include "webrtc/test/testsupport/gtest_disable.h"
using buzz::QName; using buzz::QName;
using buzz::XmlAttr; using buzz::XmlAttr;
@ -239,7 +240,7 @@ class XmlElementCreatorThread : public rtc::Thread {
// If XmlElement creation and destruction isn't thread safe, // If XmlElement creation and destruction isn't thread safe,
// this test should crash. // this test should crash.
TEST(XmlElementTest, TestMultithread) { TEST(XmlElementTest, DISABLED_ON_MAC(TestMultithread)) {
int thread_count = 2; // Was 100, but that's too slow. int thread_count = 2; // Was 100, but that's too slow.
int elem_count = 100; // Was 100000, but that's too slow. int elem_count = 100; // Was 100000, but that's too slow.
buzz::QName qname("foo", "bar"); buzz::QName qname("foo", "bar");

12
webrtc/libjingle/xmllite/xmllite_tests.gyp → webrtc/libjingle/xmllite/xmllite_tests.gypi
View File

@ -11,15 +11,8 @@
'targets': [ 'targets': [
{ {
'target_name': 'rtc_xmllite_unittest', 'target_name': 'rtc_xmllite_unittest',
'type': 'executable', 'type': 'none',
'dependencies': [ 'direct_dependent_settings': {
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'xmllite.gyp:rtc_xmllite',
],
'cflags_cc!': [
'-Wnon-virtual-dtor',
],
'sources': [ 'sources': [
'qname_unittest.cc', 'qname_unittest.cc',
'xmlbuilder_unittest.cc', 'xmlbuilder_unittest.cc',
@ -29,6 +22,7 @@
'xmlprinter_unittest.cc', 'xmlprinter_unittest.cc',
], ],
}, },
},
], ],
} }

2
webrtc/webrtc.gyp
View File

@ -9,6 +9,7 @@
'conditions': [ 'conditions': [
['include_tests==1', { ['include_tests==1', {
'includes': [ 'includes': [
'libjingle/xmllite/xmllite_tests.gypi',
'sound/sound_tests.gypi', 'sound/sound_tests.gypi',
'webrtc_tests.gypi', 'webrtc_tests.gypi',
], ],
@ -45,7 +46,6 @@
['include_tests==1', { ['include_tests==1', {
'dependencies': [ 'dependencies': [
'common_video/common_video_unittests.gyp:*', 'common_video/common_video_unittests.gyp:*',
'libjingle/xmllite/xmllite_tests.gyp:*',
'system_wrappers/source/system_wrappers_tests.gyp:*', 'system_wrappers/source/system_wrappers_tests.gyp:*',
'test/metrics.gyp:*', 'test/metrics.gyp:*',
'test/test.gyp:*', 'test/test.gyp:*',

2
webrtc/webrtc_tests.gypi
View File

@ -14,7 +14,9 @@
'base/base.gyp:rtc_base', 'base/base.gyp:rtc_base',
'base/base_tests.gyp:rtc_base_tests_utils', 'base/base_tests.gyp:rtc_base_tests_utils',
'base/base_tests.gyp:rtc_base_tests', 'base/base_tests.gyp:rtc_base_tests',
'libjingle/xmllite/xmllite.gyp:rtc_xmllite',
'rtc_sound_tests', 'rtc_sound_tests',
'rtc_xmllite_unittest',
'sound/sound.gyp:rtc_sound', 'sound/sound.gyp:rtc_sound',
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
], ],