From 3c9b8626b82927fb472a41d134c9950e19625857 Mon Sep 17 00:00:00 2001
From: Sean Klein <smklein@google.com>
Date: Thu, 9 May 2019 11:15:28 -0700
Subject: [PATCH] [test][async-testutils] Relocate unit tests to exist
 alongside source

Change-Id: I662592845b752ae2dffaf969446946840bfa259e
---
 .../async-testutils => ulib/async-testutils/test}/BUILD.gn | 7 +++++++
 .../async-testutils/test}/test_loop_tests.cpp              | 0
 zircon/system/utest/BUILD.gn                               | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)
 rename zircon/system/{utest/async-testutils => ulib/async-testutils/test}/BUILD.gn (87%)
 rename zircon/system/{utest/async-testutils => ulib/async-testutils/test}/test_loop_tests.cpp (100%)

diff --git a/zircon/system/utest/async-testutils/BUILD.gn b/zircon/system/ulib/async-testutils/test/BUILD.gn
similarity index 87%
rename from zircon/system/utest/async-testutils/BUILD.gn
rename to zircon/system/ulib/async-testutils/test/BUILD.gn
index 11a551b9a79..f2575999454 100644
--- a/zircon/system/utest/async-testutils/BUILD.gn
+++ b/zircon/system/ulib/async-testutils/test/BUILD.gn
@@ -2,6 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+group("test") {
+  testonly = true
+  deps = [
+    ":async-testutils",
+  ]
+}
+
 test("async-testutils") {
   sources = [
     "test_loop_tests.cpp",
diff --git a/zircon/system/utest/async-testutils/test_loop_tests.cpp b/zircon/system/ulib/async-testutils/test/test_loop_tests.cpp
similarity index 100%
rename from zircon/system/utest/async-testutils/test_loop_tests.cpp
rename to zircon/system/ulib/async-testutils/test/test_loop_tests.cpp
diff --git a/zircon/system/utest/BUILD.gn b/zircon/system/utest/BUILD.gn
index 282d11d3dfc..ee393e5224d 100644
--- a/zircon/system/utest/BUILD.gn
+++ b/zircon/system/utest/BUILD.gn
@@ -60,6 +60,7 @@ if (current_cpu != "") {
       "$zx/system/uapp/nand-util:nand-util-test",
       "$zx/system/ulib/async/test",
       "$zx/system/ulib/async-loop/test",
+      "$zx/system/ulib/async-testutils/test",
       "$zx/system/ulib/bitmap/test",
       "$zx/system/ulib/blobfs/test",
       "$zx/system/ulib/bootfs:bootfs-test",
@@ -91,7 +92,6 @@ if (current_cpu != "") {
       "$zx/system/ulib/zxio/test",
       "$zx/system/ulib/zxtest/test",
       "abigen",
-      "async-testutils",
       "backtrace-request",
       "biotime",
       "blobfs",
-- 
GitLab