[camera][bin] Migrate controller_parser to use newer build templates
This CL refactors the build structure in
bin/camera-gym/controller_parser to use newer build templates.
Tests that use the new templates can be run via `fx test //src/camera`
Change-Id: Id9c4a54b3f51726a92c33c480ba24940fce7996f
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/476017
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
Fuchsia-Auto-Submit: Nic Zoghb <nzo@google.com>
Reviewed-by: Tim Detwiler <tjdetwiler@google.com>
diff --git a/src/camera/bin/camera-gym/BUILD.gn b/src/camera/bin/camera-gym/BUILD.gn
index b7b7718..92791cf 100644
--- a/src/camera/bin/camera-gym/BUILD.gn
+++ b/src/camera/bin/camera-gym/BUILD.gn
@@ -21,7 +21,10 @@
group("tests") {
testonly = true
- deps = [ ":camera_gym_test" ]
+ deps = [
+ ":camera_gym_test",
+ "controller_parser:tests",
+ ]
}
source_set("lib") {
diff --git a/src/camera/bin/camera-gym/controller_parser/BUILD.gn b/src/camera/bin/camera-gym/controller_parser/BUILD.gn
index 9d8fd07..42e6fe9 100644
--- a/src/camera/bin/camera-gym/controller_parser/BUILD.gn
+++ b/src/camera/bin/camera-gym/controller_parser/BUILD.gn
@@ -2,35 +2,42 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/package.gni")
-import("//src/camera/debug.gni")
+import("//src/sys/build/fuchsia_unittest_package.gni")
+
+# This group is not currently depended on
+group("controller_parser") {
+ deps = [ ":lib" ]
+}
+
+group("tests") {
+ testonly = true
+ deps = [ ":camera_gym_controller_parser_unittest" ]
+}
source_set("lib") {
sources = [
"controller_parser.cc",
"controller_parser.h",
]
-
- public_deps = [
+ deps = [
"//sdk/lib/fidl/cpp",
"//sdk/lib/sys/cpp",
"//sdk/lib/syslog/cpp",
"//sdk/lib/syslog/cpp:backend_legacy",
- "//src/camera/bin/camera-gym/fidl:controller",
"//src/lib/fxl",
]
+ public_deps = [ "//src/camera/bin/camera-gym/fidl:controller" ]
+}
+
+executable("camera_gym_controller_parser_unittest_bin") {
+ testonly = true
+ sources = [ "controller_parser_unittest.cc" ]
+ deps = [
+ ":lib",
+ "//src/lib/fxl/test:gtest_main",
+ ]
}
-executable("camera_gym_controller_parser_test") {
- testonly = true
- output_name = "camera_gym_controller_parser_test"
- sources = [ "controller_parser_test.cc" ]
- deps = [
- ":lib",
- "//sdk/lib/sys/cpp",
- "//sdk/lib/sys/cpp/testing:unit",
- "//src/camera/bin/camera-gym/fidl:controller",
- "//src/lib/fxl",
- "//src/lib/fxl/test:gtest_main",
- ]
+fuchsia_unittest_package("camera_gym_controller_parser_unittest") {
+ deps = [ ":camera_gym_controller_parser_unittest_bin" ]
}
diff --git a/src/camera/bin/camera-gym/controller_parser/camera_gym_controller_parser_test.cmx b/src/camera/bin/camera-gym/controller_parser/camera_gym_controller_parser_test.cmx
deleted file mode 100644
index 98b8ede..0000000
--- a/src/camera/bin/camera-gym/controller_parser/camera_gym_controller_parser_test.cmx
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "program": {
- "binary": "test/camera_gym_controller_parser_test"
- },
- "sandbox": {
- "services": [
- "fuchsia.logger.LogSink",
- "fuchsia.tracing.provider.Registry"
- ]
- }
-}
diff --git a/src/camera/bin/camera-gym/controller_parser/controller_parser.cc b/src/camera/bin/camera-gym/controller_parser/controller_parser.cc
index 682a633..093effc 100644
--- a/src/camera/bin/camera-gym/controller_parser/controller_parser.cc
+++ b/src/camera/bin/camera-gym/controller_parser/controller_parser.cc
@@ -8,7 +8,6 @@
#include <lib/fit/result.h>
#include <lib/syslog/cpp/log_settings.h>
#include <lib/syslog/cpp/macros.h>
-#include <string.h>
#include "src/lib/fxl/command_line.h"
diff --git a/src/camera/bin/camera-gym/controller_parser/controller_parser_test.cc b/src/camera/bin/camera-gym/controller_parser/controller_parser_unittest.cc
similarity index 100%
rename from src/camera/bin/camera-gym/controller_parser/controller_parser_test.cc
rename to src/camera/bin/camera-gym/controller_parser/controller_parser_unittest.cc
diff --git a/src/camera/tests.gni b/src/camera/tests.gni
index 839e852..bf4c2f0 100644
--- a/src/camera/tests.gni
+++ b/src/camera/tests.gni
@@ -5,7 +5,6 @@
camera_tests = {
deps = [
- "//src/camera/bin/camera-gym/controller_parser:camera_gym_controller_parser_test",
"//src/camera/bin/device:unittests",
"//src/camera/bin/device_watcher/test",
"//src/camera/bin/factory/test",
@@ -79,11 +78,6 @@
manifest = "//src/camera/drivers/sensors/imx227/test/meta/imx227_test.cmx"
environments = [ sherlock_env ]
},
- {
- name = "camera_gym_controller_parser_test"
- manifest = "//src/camera/bin/camera-gym/controller_parser/camera_gym_controller_parser_test.cmx"
- environments = basic_envs
- },
# Put additional camera tests here
]
