Moves xmllite's unittests to rtc_unittest.

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/webrtc@7369 4adac7df-926f-26a2-2b94-8c16560cd09d

libjingle/xmllite/xmlelement_unittest.cc

diff --git a/libjingle/xmllite/xmlelement_unittest.cc b/libjingle/xmllite/xmlelement_unittest.cc
index df8faed..0f20e75 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 @@
 
 // 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");

libjingle/xmllite/xmllite_tests.gyp

diff --git a/libjingle/xmllite/xmllite_tests.gyp b/libjingle/xmllite/xmllite_tests.gyp
deleted file mode 100644
index b71a9b6..0000000
--- a/libjingle/xmllite/xmllite_tests.gyp
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2014 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.
-
-{
-  'includes': [ '../../build/common.gypi', ],
-  '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',
-      ],
-    },
-  ],
-}
-  

libjingle/xmllite/xmllite_tests.gypi

diff --git a/libjingle/xmllite/xmllite_tests.gypi b/libjingle/xmllite/xmllite_tests.gypi
new file mode 100644
index 0000000..600a0f5
--- /dev/null
+++ b/libjingle/xmllite/xmllite_tests.gypi
@@ -0,0 +1,28 @@
+# Copyright (c) 2014 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.
+
+{
+  'includes': [ '../../build/common.gypi', ],
+  'targets': [
+    {
+      'target_name': 'rtc_xmllite_unittest',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'sources': [
+          'qname_unittest.cc',
+          'xmlbuilder_unittest.cc',
+          'xmlelement_unittest.cc',
+          'xmlnsstack_unittest.cc',
+          'xmlparser_unittest.cc',
+          'xmlprinter_unittest.cc',
+        ],
+      },
+    },
+  ],
+}
+

webrtc.gyp

diff --git a/webrtc.gyp b/webrtc.gyp
index 2d2dc04..bfcec04 100644
--- a/webrtc.gyp
+++ b/webrtc.gyp
@@ -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:*',

webrtc_tests.gypi

diff --git a/webrtc_tests.gypi b/webrtc_tests.gypi
index 15e1d1c..cfd5a4b 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',
       ],