From ab5c2b80e1da0b9c4721515dabee55c0f0579087 Mon Sep 17 00:00:00 2001
From: Sean Klein <smklein@google.com>
Date: Thu, 9 May 2019 11:32:15 -0700
Subject: [PATCH] [test][launchpad] Relocate unit tests to exist alongside
source
Change-Id: Ia4ebd88e8ad9b9f73937e94c107aa211a21859e4
---
.../{utest/launchpad => ulib/launchpad/test}/BUILD.gn | 7 +++++++
.../{utest/launchpad => ulib/launchpad/test}/launchpad.cpp | 0
zircon/system/utest/BUILD.gn | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
rename zircon/system/{utest/launchpad => ulib/launchpad/test}/BUILD.gn (87%)
rename zircon/system/{utest/launchpad => ulib/launchpad/test}/launchpad.cpp (100%)
diff --git a/zircon/system/utest/launchpad/BUILD.gn b/zircon/system/ulib/launchpad/test/BUILD.gn
similarity index 87%
rename from zircon/system/utest/launchpad/BUILD.gn
rename to zircon/system/ulib/launchpad/test/BUILD.gn
index c470a30a866..466e54e3265 100644
--- a/zircon/system/utest/launchpad/BUILD.gn
+++ b/zircon/system/ulib/launchpad/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 = [
+ ":launchpad",
+ ]
+}
+
test("launchpad") {
sources = [
"launchpad.cpp",
diff --git a/zircon/system/utest/launchpad/launchpad.cpp b/zircon/system/ulib/launchpad/test/launchpad.cpp
similarity index 100%
rename from zircon/system/utest/launchpad/launchpad.cpp
rename to zircon/system/ulib/launchpad/test/launchpad.cpp
diff --git a/zircon/system/utest/BUILD.gn b/zircon/system/utest/BUILD.gn
index 78c51086672..152777ef7e5 100644
--- a/zircon/system/utest/BUILD.gn
+++ b/zircon/system/utest/BUILD.gn
@@ -77,6 +77,7 @@ if (current_cpu != "") {
"$zx/system/ulib/fzl/test",
"$zx/system/ulib/gpt/test",
"$zx/system/ulib/id_allocator/test",
+ "$zx/system/ulib/launchpad/test",
"$zx/system/ulib/libzbi/test",
"$zx/system/ulib/kvstore:kvstore-test",
"$zx/system/ulib/lazy_init:lazy_init-test",
@@ -147,7 +148,6 @@ if (current_cpu != "") {
"int-types",
"kcounter",
"kernel-unittests",
- "launchpad",
"libhwreg",
"log",
"logger",
--
GitLab