From e50358f90552b397bcf8ad0f1a79a1c37e08bf76 Mon Sep 17 00:00:00 2001
From: Sean Klein <smklein@google.com>
Date: Mon, 13 May 2019 16:21:23 +0000
Subject: [PATCH] [test][utf_conversion] Relocate unit tests to exist alongside
source
Change-Id: I8cd0ba4f4ae1af47271462a6da8ddcd7813a19d8
---
.../utf_conversion => ulib/utf_conversion/test}/BUILD.gn | 7 +++++++
.../utf_conversion => ulib/utf_conversion/test}/main.cpp | 0
zircon/system/utest/BUILD.gn | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
rename zircon/system/{utest/utf_conversion => ulib/utf_conversion/test}/BUILD.gn (84%)
rename zircon/system/{utest/utf_conversion => ulib/utf_conversion/test}/main.cpp (100%)
diff --git a/zircon/system/utest/utf_conversion/BUILD.gn b/zircon/system/ulib/utf_conversion/test/BUILD.gn
similarity index 84%
rename from zircon/system/utest/utf_conversion/BUILD.gn
rename to zircon/system/ulib/utf_conversion/test/BUILD.gn
index 37f4cb0a5c3..d1a5264faf7 100644
--- a/zircon/system/utest/utf_conversion/BUILD.gn
+++ b/zircon/system/ulib/utf_conversion/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 = [
+ ":utf_conversion",
+ ]
+}
+
test("utf_conversion") {
sources = [
"main.cpp",
diff --git a/zircon/system/utest/utf_conversion/main.cpp b/zircon/system/ulib/utf_conversion/test/main.cpp
similarity index 100%
rename from zircon/system/utest/utf_conversion/main.cpp
rename to zircon/system/ulib/utf_conversion/test/main.cpp
diff --git a/zircon/system/utest/BUILD.gn b/zircon/system/utest/BUILD.gn
index 075182f5dc2..8a8ede7aa31 100644
--- a/zircon/system/utest/BUILD.gn
+++ b/zircon/system/utest/BUILD.gn
@@ -94,6 +94,7 @@ if (current_cpu != "") {
"$zx/system/ulib/tftp:tftp-test",
"$zx/system/ulib/trace-reader:tests",
"$zx/system/ulib/trace-vthread:tests",
+ "$zx/system/ulib/utf_conversion/test",
"$zx/system/ulib/zbi-bootfs/test",
"$zx/system/ulib/zx/test",
"$zx/system/ulib/zxio/test",
@@ -184,7 +185,6 @@ if (current_cpu != "") {
"trace",
"usb",
"usb-virtual-bus",
- "utf_conversion",
"util",
"vdso",
"vdso-base",
--
GitLab