diff options
| -rw-r--r-- | libjingle/xmllite/xmlelement_unittest.cc | 3 | ||||
| -rw-r--r-- | libjingle/xmllite/xmllite_tests.gypi (renamed from libjingle/xmllite/xmllite_tests.gyp) | 30 | ||||
| -rw-r--r-- | webrtc.gyp | 2 | ||||
| -rw-r--r-- | webrtc_tests.gypi | 2 |
4 files changed, 17 insertions, 20 deletions
diff --git a/libjingle/xmllite/xmlelement_unittest.cc b/libjingle/xmllite/xmlelement_unittest.cc index df8faedb..0f20e751 100644 --- a/libjingle/xmllite/xmlelement_unittest.cc +++ b/libjingle/xmllite/xmlelement_unittest.cc @@ -15,6 +15,7 @@ #include "webrtc/base/common.h" #include "webrtc/base/gunit.h" #include "webrtc/base/thread.h" +#include "webrtc/test/testsupport/gtest_disable.h" using buzz::QName; using buzz::XmlAttr; @@ -239,7 +240,7 @@ class XmlElementCreatorThread : public rtc::Thread { // If XmlElement creation and destruction isn't thread safe, // 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 elem_count = 100; // Was 100000, but that's too slow. buzz::QName qname("foo", "bar"); diff --git a/libjingle/xmllite/xmllite_tests.gyp b/libjingle/xmllite/xmllite_tests.gypi index b71a9b6b..600a0f55 100644 --- a/libjingle/xmllite/xmllite_tests.gyp +++ b/libjingle/xmllite/xmllite_tests.gypi @@ -11,24 +11,18 @@ 'targets': [ { 'target_name': 'rtc_xmllite_unittest', - 'type': 'executable', - 'dependencies': [ - '<(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': [ - 'qname_unittest.cc', - 'xmlbuilder_unittest.cc', - 'xmlelement_unittest.cc', - 'xmlnsstack_unittest.cc', - 'xmlparser_unittest.cc', - 'xmlprinter_unittest.cc', - ], + 'type': 'none', + 'direct_dependent_settings': { + 'sources': [ + 'qname_unittest.cc', + 'xmlbuilder_unittest.cc', + 'xmlelement_unittest.cc', + 'xmlnsstack_unittest.cc', + 'xmlparser_unittest.cc', + 'xmlprinter_unittest.cc', + ], + }, }, ], } - + @@ -9,6 +9,7 @@ 'conditions': [ ['include_tests==1', { 'includes': [ + 'libjingle/xmllite/xmllite_tests.gypi', 'sound/sound_tests.gypi', 'webrtc_tests.gypi', ], @@ -45,7 +46,6 @@ ['include_tests==1', { 'dependencies': [ 'common_video/common_video_unittests.gyp:*', - 'libjingle/xmllite/xmllite_tests.gyp:*', 'system_wrappers/source/system_wrappers_tests.gyp:*', 'test/metrics.gyp:*', 'test/test.gyp:*', diff --git a/webrtc_tests.gypi b/webrtc_tests.gypi index 15e1d1cf..cfd5a4b2 100644 --- a/webrtc_tests.gypi +++ b/webrtc_tests.gypi @@ -14,7 +14,9 @@ 'base/base.gyp:rtc_base', 'base/base_tests.gyp:rtc_base_tests_utils', 'base/base_tests.gyp:rtc_base_tests', + 'libjingle/xmllite/xmllite.gyp:rtc_xmllite', 'rtc_sound_tests', + 'rtc_xmllite_unittest', 'sound/sound.gyp:rtc_sound', '<(DEPTH)/testing/gtest.gyp:gtest', ], |