From 5d487c19baaa8bd7cf2d65f392d4281d6329f11d Mon Sep 17 00:00:00 2001
From: Sean Klein <smklein@google.com>
Date: Thu, 9 May 2019 09:27:08 -0700
Subject: [PATCH] [test][zxio] Relocate unit tests to exist alongside source
Change-Id: Iec0b5b83dbcabb41d64f6c13682ac8bb3ddf68e3
---
zircon/system/{utest/zxio => ulib/zxio/test}/BUILD.gn | 7 +++++++
zircon/system/{utest/zxio => ulib/zxio/test}/null-test.cpp | 0
.../system/{utest/zxio => ulib/zxio/test}/vmofile-test.cpp | 0
zircon/system/{utest/zxio => ulib/zxio/test}/zxio-test.cpp | 0
zircon/system/utest/BUILD.gn | 2 +-
5 files changed, 8 insertions(+), 1 deletion(-)
rename zircon/system/{utest/zxio => ulib/zxio/test}/BUILD.gn (88%)
rename zircon/system/{utest/zxio => ulib/zxio/test}/null-test.cpp (100%)
rename zircon/system/{utest/zxio => ulib/zxio/test}/vmofile-test.cpp (100%)
rename zircon/system/{utest/zxio => ulib/zxio/test}/zxio-test.cpp (100%)
diff --git a/zircon/system/utest/zxio/BUILD.gn b/zircon/system/ulib/zxio/test/BUILD.gn
similarity index 88%
rename from zircon/system/utest/zxio/BUILD.gn
rename to zircon/system/ulib/zxio/test/BUILD.gn
index e2815f20b43..2eed486a86d 100644
--- a/zircon/system/utest/zxio/BUILD.gn
+++ b/zircon/system/ulib/zxio/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 = [
+ ":zxio",
+ ]
+}
+
test("zxio") {
sources = [
"null-test.cpp",
diff --git a/zircon/system/utest/zxio/null-test.cpp b/zircon/system/ulib/zxio/test/null-test.cpp
similarity index 100%
rename from zircon/system/utest/zxio/null-test.cpp
rename to zircon/system/ulib/zxio/test/null-test.cpp
diff --git a/zircon/system/utest/zxio/vmofile-test.cpp b/zircon/system/ulib/zxio/test/vmofile-test.cpp
similarity index 100%
rename from zircon/system/utest/zxio/vmofile-test.cpp
rename to zircon/system/ulib/zxio/test/vmofile-test.cpp
diff --git a/zircon/system/utest/zxio/zxio-test.cpp b/zircon/system/ulib/zxio/test/zxio-test.cpp
similarity index 100%
rename from zircon/system/utest/zxio/zxio-test.cpp
rename to zircon/system/ulib/zxio/test/zxio-test.cpp
diff --git a/zircon/system/utest/BUILD.gn b/zircon/system/utest/BUILD.gn
index c575196e31e..d3c8bac469f 100644
--- a/zircon/system/utest/BUILD.gn
+++ b/zircon/system/utest/BUILD.gn
@@ -86,6 +86,7 @@ if (current_cpu != "") {
"$zx/system/ulib/trace-vthread:tests",
"$zx/system/ulib/zbi-bootfs/test",
"$zx/system/ulib/zx/test",
+ "$zx/system/ulib/zxio/test",
"$zx/system/ulib/zxtest/test",
"abigen",
"async-testutils",
@@ -193,7 +194,6 @@ if (current_cpu != "") {
"vmo",
"zbi",
"zxcrypt",
- "zxio",
# disabled for now:
#"bad-kernel-access",
--
GitLab