GN: Refactor webrtc_nonparallel_tests and audio_tests to avoid crossing package boundaries.

webrtc/base/BUILD.gn

 # 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.
 
 import("//build/config/crypto.gni")
 import("//build/config/ui.gni")
@@ skipping 268 matching lines @@
     if (is_asan) {
       if (current_cpu == "x64") {
         data += [ "$clang_base_path/lib/clang/$clang_version/lib/windows/clang_rt.asan_dynamic-x86_64.dll" ]
       } else {
         data += [ "$clang_base_path/lib/clang/$clang_version/lib/windows/clang_rt.asan_dynamic-i386.dll" ]
       }
     }
   }
 }
 
-if (rtc_include_tests) {
-  rtc_source_set("rtc_base_approved_unittests") {
-    testonly = true
-    sources = [
-      "array_view_unittest.cc",
-      "atomicops_unittest.cc",
-      "base64_unittest.cc",
-      "basictypes_unittest.cc",
-      "bind_unittest.cc",
-      "bitbuffer_unittest.cc",
-      "buffer_unittest.cc",
-      "bufferqueue_unittest.cc",
-      "bytebuffer_unittest.cc",
-      "byteorder_unittest.cc",
-      "copyonwritebuffer_unittest.cc",
-      "criticalsection_unittest.cc",
-      "event_tracer_unittest.cc",
-      "event_unittest.cc",
-      "file_unittest.cc",
-      "function_view_unittest.cc",
-      "logging_unittest.cc",
-      "md5digest_unittest.cc",
-      "mod_ops_unittest.cc",
-      "onetimeevent_unittest.cc",
-      "optional_unittest.cc",
-      "pathutils_unittest.cc",
-      "platform_thread_unittest.cc",
-      "random_unittest.cc",
-      "rate_limiter_unittest.cc",
-      "rate_statistics_unittest.cc",
-      "ratetracker_unittest.cc",
-      "refcountedobject_unittest.cc",
-      "safe_compare_unittest.cc",
-      "stringencode_unittest.cc",
-      "stringutils_unittest.cc",
-      "swap_queue_unittest.cc",
-
-      # TODO(ronghuawu): Reenable this test.
-      # "systeminfo_unittest.cc",
-      "thread_annotations_unittest.cc",
-      "thread_checker_unittest.cc",
-      "timestampaligner_unittest.cc",
-      "timeutils_unittest.cc",
-    ]
-    deps = [
-      ":rtc_base_approved",
-      ":rtc_base_tests_utils",
-    ]
-    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" ]
-    }
-  }
-}
-
 config("enable_libevent_config") {
   defines = [ "WEBRTC_BUILD_LIBEVENT" ]
 }
 
 rtc_static_library("rtc_task_queue") {
   public_deps = [
     ":rtc_base_approved",
   ]
 
   sources = [
@@ skipping 33 matching lines @@
           "task_queue_posix.cc",
         ]
       }
       if (is_win) {
         sources += [ "task_queue_win.cc" ]
       }
     }
   }
 }
 
-if (rtc_include_tests) {
-  rtc_source_set("rtc_task_queue_unittests") {
-    testonly = true
-    sources = [
-      "sequenced_task_checker_unittest.cc",
-      "task_queue_unittest.cc",
-      "weak_ptr_unittest.cc",
-    ]
-    deps = [
-      ":rtc_base_tests_utils",
-      ":rtc_task_queue",
-    ]
-    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" ]
-    }
-  }
-}
-
 rtc_static_library("rtc_analytics") {
   sources = [
     "analytics/exp_filter.cc",
     "analytics/exp_filter.h",
     "analytics/percentile_filter.h",
   ]
   deps = [
     ":rtc_base_approved",
   ]
 }
 
-if (rtc_include_tests) {
-  rtc_source_set("rtc_analytics_unittests") {
-    testonly = true
-    sources = [
-      "analytics/exp_filter_unittest.cc",
-      "analytics/percentile_filter_unittest.cc",
-    ]
-    deps = [
-      ":rtc_analytics",
-      ":rtc_base_tests_utils",
-    ]
-  }
-}
-
 config("rtc_base_warnings_config") {
   if (is_win && is_clang) {
     cflags = [
       # Disable warnings failing when compiling with Clang on Windows.
       # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
       "-Wno-sign-compare",
       "-Wno-missing-braces",
     ]
   }
 }
@@ skipping 317 matching lines @@
     deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
     defines += [ "timezone=_timezone" ]
     sources -= [ "ifaddrs_converter.cc" ]
   }
   if (is_win && is_clang) {
     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
 }
 
+rtc_source_set("gtest_prod") {
+  sources = [
+    "gtest_prod_util.h",
+  ]
+}
+
 if (rtc_include_tests) {
+  config("rtc_base_tests_utils_exported_config") {
+    defines = [ "GTEST_RELATIVE_PATH" ]
+  }
+
+  config("rtc_base_tests_utils_warnings_config") {
+    if (is_win && is_clang) {
+      cflags = [
+        # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6270
+        "-Wno-reorder",
+        "-Wno-sign-compare",
+      ]
+    }
+  }
+
+  rtc_source_set("rtc_base_tests_utils") {
+    testonly = true
+    sources = [
+      # Also use this as a convenient dumping ground for misc files that are
+      # included by multiple targets below.
+      "fakeclock.cc",
+      "fakeclock.h",
+      "fakenetwork.h",
+      "fakesslidentity.h",
+      "faketaskrunner.h",
+      "firewallsocketserver.cc",
+      "firewallsocketserver.h",
+      "gunit.h",
+      "natserver.cc",
+      "natserver.h",
+      "natsocketfactory.cc",
+      "natsocketfactory.h",
+      "nattypes.cc",
+      "nattypes.h",
+      "sigslottester.h",
+      "sigslottester.h.pump",
+      "testbase64.h",
+      "testechoserver.h",
+      "testutils.h",
+      "timedelta.h",
+      "unittest_main.cc",
+    ]
+    configs += [ ":rtc_base_tests_utils_warnings_config" ]
+    public_configs = [ ":rtc_base_tests_utils_exported_config" ]
+    deps = [
+      ":rtc_base",
+      "../test:field_trial",
+      "../test:test_support",
+    ]
+    public_deps = [
+      "//testing/gmock",
+      "//testing/gtest",
+    ]
+
+    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" ]
+    }
+  }
+
+  rtc_source_set("base_nonparallel_tests") {

[kjellander_webrtc, 2017/01/05 11:26:30]

Let's rename these to use rtc_base as prefix everywhere (one could argue base is
a better name though)

[kjellander_webrtc, 2017/01/05 11:26:30]

I assume everything else is just moved code except this new target?

[ehmaldonado_webrtc, 2017/01/05 12:30:22]

Yeah, I wanted to put everything under a single rtc_include_tests condition

+    testonly = true
+    sources = [
+      "nullsocketserver_unittest.cc",
+      "physicalsocketserver_unittest.cc",
+      "socket_unittest.cc",
+      "socket_unittest.h",
+      "socketaddress_unittest.cc",
+      "virtualsocket_unittest.cc",
+    ]
+    deps = [
+      ":rtc_base",
+      ":rtc_base_tests_utils",
+      "//testing/gtest",
+    ]
+    if (is_win) {
+      sources += [ "win32socketserver_unittest.cc" ]
+    }
+
+    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" ]
+    }
+  }
+
+  rtc_source_set("rtc_base_approved_unittests") {
+    testonly = true
+    sources = [
+      "array_view_unittest.cc",
+      "atomicops_unittest.cc",
+      "base64_unittest.cc",
+      "basictypes_unittest.cc",
+      "bind_unittest.cc",
+      "bitbuffer_unittest.cc",
+      "buffer_unittest.cc",
+      "bufferqueue_unittest.cc",
+      "bytebuffer_unittest.cc",
+      "byteorder_unittest.cc",
+      "copyonwritebuffer_unittest.cc",
+      "criticalsection_unittest.cc",
+      "event_tracer_unittest.cc",
+      "event_unittest.cc",
+      "file_unittest.cc",
+      "function_view_unittest.cc",
+      "logging_unittest.cc",
+      "md5digest_unittest.cc",
+      "mod_ops_unittest.cc",
+      "onetimeevent_unittest.cc",
+      "optional_unittest.cc",
+      "pathutils_unittest.cc",
+      "platform_thread_unittest.cc",
+      "random_unittest.cc",
+      "rate_limiter_unittest.cc",
+      "rate_statistics_unittest.cc",
+      "ratetracker_unittest.cc",
+      "refcountedobject_unittest.cc",
+      "safe_compare_unittest.cc",
+      "stringencode_unittest.cc",
+      "stringutils_unittest.cc",
+      "swap_queue_unittest.cc",
+
+      # TODO(ronghuawu): Reenable this test.
+      # "systeminfo_unittest.cc",
+      "thread_annotations_unittest.cc",
+      "thread_checker_unittest.cc",
+      "timestampaligner_unittest.cc",
+      "timeutils_unittest.cc",
+    ]
+    deps = [
+      ":rtc_base_approved",
+      ":rtc_base_tests_utils",
+    ]
+    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" ]
+    }
+  }
+
+  rtc_source_set("rtc_task_queue_unittests") {
+    testonly = true
+    sources = [
+      "sequenced_task_checker_unittest.cc",
+      "task_queue_unittest.cc",
+      "weak_ptr_unittest.cc",
+    ]
+    deps = [
+      ":rtc_base_tests_utils",
+      ":rtc_task_queue",
+    ]
+    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" ]
+    }
+  }
+
+  rtc_source_set("rtc_analytics_unittests") {
+    testonly = true
+    sources = [
+      "analytics/exp_filter_unittest.cc",
+      "analytics/percentile_filter_unittest.cc",
+    ]
+    deps = [
+      ":rtc_analytics",
+      ":rtc_base_tests_utils",
+    ]
+  }
+
   config("rtc_base_unittests_config") {
     if (is_clang) {
       cflags = [ "-Wno-unused-const-variable" ]
     }
   }
   rtc_source_set("rtc_base_unittests") {
     testonly = true
     sources = [
       "autodetectproxy_unittest.cc",
       "callback_unittest.cc",
@@ skipping 50 matching lines @@
       ":rtc_base",
     ]
     configs += [ ":rtc_base_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" ]
     }
   }
 }
 
-rtc_source_set("gtest_prod") {
-  sources = [
-    "gtest_prod_util.h",
-  ]
-}
-
-if (rtc_include_tests) {
-  config("rtc_base_tests_utils_exported_config") {
-    defines = [ "GTEST_RELATIVE_PATH" ]
-  }
-
-  config("rtc_base_tests_utils_warnings_config") {
-    if (is_win && is_clang) {
-      cflags = [
-        # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6270
-        "-Wno-reorder",
-        "-Wno-sign-compare",
-      ]
-    }
-  }
-
-  rtc_source_set("rtc_base_tests_utils") {
-    testonly = true
-    sources = [
-      # Also use this as a convenient dumping ground for misc files that are
-      # included by multiple targets below.
-      "fakeclock.cc",
-      "fakeclock.h",
-      "fakenetwork.h",
-      "fakesslidentity.h",
-      "faketaskrunner.h",
-      "firewallsocketserver.cc",
-      "firewallsocketserver.h",
-      "gunit.h",
-      "natserver.cc",
-      "natserver.h",
-      "natsocketfactory.cc",
-      "natsocketfactory.h",
-      "nattypes.cc",
-      "nattypes.h",
-      "sigslottester.h",
-      "sigslottester.h.pump",
-      "testbase64.h",
-      "testechoserver.h",
-      "testutils.h",
-      "timedelta.h",
-      "unittest_main.cc",
-    ]
-    configs += [ ":rtc_base_tests_utils_warnings_config" ]
-    public_configs = [ ":rtc_base_tests_utils_exported_config" ]
-    deps = [
-      ":rtc_base",
-      "../test:field_trial",
-      "../test:test_support",
-    ]
-    public_deps = [
-      "//testing/gmock",
-      "//testing/gtest",
-    ]
-
-    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" ]
-    }
-  }
-}
-
 if (is_android) {
   android_library("base_java") {
     java_files = [
       "java/src/org/webrtc/Logging.java",
       "java/src/org/webrtc/Size.java",
       "java/src/org/webrtc/ThreadUtils.java",
     ]
 
     deps = [
       "//base:base_java",
     ]
   }
 }