[camera] Collect driver bind tests into one target
This CL:
- Collects all driver bind tests in //src/camera/drivers:bind_tests and
includes them in //src/camera:tests
- Renames "tests.json" to "bind_tests.json"
- Renames other build groups/targets for clarity
Test: all tests run successfully
Change-Id: I203a23204eb0d54354972861ab008f3de258c4a5
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/441167
Reviewed-by: Tim Detwiler <tjdetwiler@google.com>
Testability-Review: Tim Detwiler <tjdetwiler@google.com>
Commit-Queue: Nic Zoghb <nzo@google.com>
diff --git a/src/camera/BUILD.gn b/src/camera/BUILD.gn
index 0e1bff1..be3e934 100644
--- a/src/camera/BUILD.gn
+++ b/src/camera/BUILD.gn
@@ -52,6 +52,7 @@
deps = [
":camera_tests",
"bin",
+ "drivers:bind_tests",
]
}
diff --git a/src/camera/drivers/BUILD.gn b/src/camera/drivers/BUILD.gn
index cf66d65..f9c3cc8 100644
--- a/src/camera/drivers/BUILD.gn
+++ b/src/camera/drivers/BUILD.gn
@@ -23,6 +23,16 @@
]
}
+group("bind_tests") {
+ testonly = true
+ deps = [
+ "bus:bind_test",
+ "hw_accel:bind_test",
+ "sensors:bind_test",
+ "usb_video:bind_test",
+ ]
+}
+
# Use this target to include actual drivers and tests,
# but not supporting libraries.
group("all") {
diff --git a/src/camera/drivers/bus/BUILD.gn b/src/camera/drivers/bus/BUILD.gn
index 96017b4..3da6e4a 100644
--- a/src/camera/drivers/bus/BUILD.gn
+++ b/src/camera/drivers/bus/BUILD.gn
@@ -6,7 +6,7 @@
deps = [ "aml_mipicsi" ]
}
-group("tests") {
+group("bind_test") {
testonly = true
- deps = [ "aml_mipicsi:tests" ]
+ deps = [ "aml_mipicsi:bind_test" ]
}
diff --git a/src/camera/drivers/bus/aml_mipicsi/BUILD.gn b/src/camera/drivers/bus/aml_mipicsi/BUILD.gn
index fa0208c..b0756b7 100644
--- a/src/camera/drivers/bus/aml_mipicsi/BUILD.gn
+++ b/src/camera/drivers/bus/aml_mipicsi/BUILD.gn
@@ -8,12 +8,12 @@
bind_rules("aml_mipi_bind") {
rules = "aml_mipi.bind"
- output = "aml_mipi_bind.h"
- tests = "tests.json"
+ output = "bind.h"
+ tests = "bind_tests.json"
deps = [ "//src/devices/bind/fuchsia.platform" ]
}
-group("tests") {
+group("bind_test") {
testonly = true
deps = [ ":aml_mipi_bind_test" ]
}
diff --git a/src/camera/drivers/bus/aml_mipicsi/aml_mipi.cc b/src/camera/drivers/bus/aml_mipicsi/aml_mipi.cc
index 1e2f7c1..2d22a8d 100644
--- a/src/camera/drivers/bus/aml_mipicsi/aml_mipi.cc
+++ b/src/camera/drivers/bus/aml_mipicsi/aml_mipi.cc
@@ -12,8 +12,8 @@
#include <ddk/debug.h>
-#include "src/camera/drivers/bus/aml_mipicsi/aml_mipi_bind.h"
#include "src/camera/drivers/bus/aml_mipicsi/aml_mipi_regs.h"
+#include "src/camera/drivers/bus/aml_mipicsi/bind.h"
// NOTE: A lot of magic numbers, they come from vendor
// source code.
diff --git a/src/camera/drivers/bus/aml_mipicsi/tests.json b/src/camera/drivers/bus/aml_mipicsi/bind_tests.json
similarity index 100%
rename from src/camera/drivers/bus/aml_mipicsi/tests.json
rename to src/camera/drivers/bus/aml_mipicsi/bind_tests.json
diff --git a/src/camera/drivers/hw_accel/BUILD.gn b/src/camera/drivers/hw_accel/BUILD.gn
index c4155aa..477dfca 100644
--- a/src/camera/drivers/hw_accel/BUILD.gn
+++ b/src/camera/drivers/hw_accel/BUILD.gn
@@ -8,3 +8,11 @@
"ge2d",
]
}
+
+group("bind_test") {
+ testonly = true
+ deps = [
+ "gdc:bind_test",
+ "ge2d:bind_test",
+ ]
+}
diff --git a/src/camera/drivers/hw_accel/gdc/BUILD.gn b/src/camera/drivers/hw_accel/gdc/BUILD.gn
index 087ae2c..45df6611 100644
--- a/src/camera/drivers/hw_accel/gdc/BUILD.gn
+++ b/src/camera/drivers/hw_accel/gdc/BUILD.gn
@@ -9,15 +9,15 @@
bind_rules("gdc_bind") {
rules = "gdc.bind"
- output = "gdc-bind.h"
- tests = "tests.json"
+ output = "bind.h"
+ tests = "bind_tests.json"
deps = [
"//src/devices/bind/fuchsia.composite",
"//src/devices/bind/fuchsia.platform",
]
}
-group("tests") {
+group("bind_test") {
testonly = true
deps = [ ":gdc_bind_test" ]
}
diff --git a/src/camera/drivers/hw_accel/gdc/tests.json b/src/camera/drivers/hw_accel/gdc/bind_tests.json
similarity index 100%
rename from src/camera/drivers/hw_accel/gdc/tests.json
rename to src/camera/drivers/hw_accel/gdc/bind_tests.json
diff --git a/src/camera/drivers/hw_accel/gdc/gdc.cc b/src/camera/drivers/hw_accel/gdc/gdc.cc
index 71bda17c..6e03f9d 100644
--- a/src/camera/drivers/hw_accel/gdc/gdc.cc
+++ b/src/camera/drivers/hw_accel/gdc/gdc.cc
@@ -20,7 +20,7 @@
#include <fbl/auto_lock.h>
#include <hw/reg.h>
-#include "src/camera/drivers/hw_accel/gdc/gdc-bind.h"
+#include "src/camera/drivers/hw_accel/gdc/bind.h"
#include "src/camera/drivers/hw_accel/gdc/gdc_regs.h"
namespace gdc {
diff --git a/src/camera/drivers/hw_accel/ge2d/BUILD.gn b/src/camera/drivers/hw_accel/ge2d/BUILD.gn
index 571e645..21a3072 100644
--- a/src/camera/drivers/hw_accel/ge2d/BUILD.gn
+++ b/src/camera/drivers/hw_accel/ge2d/BUILD.gn
@@ -8,15 +8,15 @@
bind_rules("ge2d_bind") {
rules = "ge2d.bind"
- output = "ge2d-bind.h"
- tests = "tests.json"
+ output = "bind.h"
+ tests = "bind_tests.json"
deps = [
"//src/devices/bind/fuchsia.composite",
"//src/devices/bind/fuchsia.platform",
]
}
-group("tests") {
+group("bind_test") {
testonly = true
deps = [ ":ge2d_bind_test" ]
}
diff --git a/src/camera/drivers/hw_accel/ge2d/bind.cc b/src/camera/drivers/hw_accel/ge2d/bind.cc
index 31a96ac..52dbb64 100644
--- a/src/camera/drivers/hw_accel/ge2d/bind.cc
+++ b/src/camera/drivers/hw_accel/ge2d/bind.cc
@@ -2,10 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "src/camera/drivers/hw_accel/ge2d/bind.h"
+
#include <lib/driver-unit-test/utils.h>
#include <lib/syslog/cpp/macros.h>
-#include "src/camera/drivers/hw_accel/ge2d/ge2d-bind.h"
#include "src/camera/drivers/hw_accel/ge2d/ge2d.h"
namespace ge2d {
diff --git a/src/camera/drivers/hw_accel/ge2d/tests.json b/src/camera/drivers/hw_accel/ge2d/bind_tests.json
similarity index 100%
rename from src/camera/drivers/hw_accel/ge2d/tests.json
rename to src/camera/drivers/hw_accel/ge2d/bind_tests.json
diff --git a/src/camera/drivers/sensors/BUILD.gn b/src/camera/drivers/sensors/BUILD.gn
index b5429f2..5d742cf 100644
--- a/src/camera/drivers/sensors/BUILD.gn
+++ b/src/camera/drivers/sensors/BUILD.gn
@@ -5,3 +5,8 @@
group("sensors") {
deps = [ "imx227" ]
}
+
+group("bind_test") {
+ testonly = true
+ deps = [ "imx227:bind_test" ]
+}
diff --git a/src/camera/drivers/sensors/imx227/BUILD.gn b/src/camera/drivers/sensors/imx227/BUILD.gn
index 36a145f..694ae25 100644
--- a/src/camera/drivers/sensors/imx227/BUILD.gn
+++ b/src/camera/drivers/sensors/imx227/BUILD.gn
@@ -8,15 +8,15 @@
bind_rules("imx227_bind") {
rules = "imx227.bind"
- output = "imx227-bind.h"
- tests = "tests.json"
+ output = "bind.h"
+ tests = "bind_tests.json"
deps = [
"//src/devices/bind/fuchsia.composite",
"//src/devices/bind/fuchsia.platform",
]
}
-group("tests") {
+group("bind_test") {
testonly = true
deps = [ ":imx227_bind_test" ]
}
diff --git a/src/camera/drivers/sensors/imx227/tests.json b/src/camera/drivers/sensors/imx227/bind_tests.json
similarity index 100%
rename from src/camera/drivers/sensors/imx227/tests.json
rename to src/camera/drivers/sensors/imx227/bind_tests.json
diff --git a/src/camera/drivers/sensors/imx227/imx227.cc b/src/camera/drivers/sensors/imx227/imx227.cc
index a011e990..7e21bbd 100644
--- a/src/camera/drivers/sensors/imx227/imx227.cc
+++ b/src/camera/drivers/sensors/imx227/imx227.cc
@@ -20,8 +20,8 @@
#include <fbl/auto_lock.h>
#include <hw/reg.h>
+#include "src/camera/drivers/sensors/imx227/bind.h"
#include "src/camera/drivers/sensors/imx227/constants.h"
-#include "src/camera/drivers/sensors/imx227/imx227-bind.h"
#include "src/camera/drivers/sensors/imx227/imx227_modes.h"
#include "src/camera/drivers/sensors/imx227/imx227_seq.h"
#include "src/camera/drivers/sensors/imx227/mipi_ccs_regs.h"
diff --git a/src/camera/drivers/usb_video/BUILD.gn b/src/camera/drivers/usb_video/BUILD.gn
index 97aeb9d..c49b8a5 100644
--- a/src/camera/drivers/usb_video/BUILD.gn
+++ b/src/camera/drivers/usb_video/BUILD.gn
@@ -10,8 +10,8 @@
bind_rules("usb_video_bind") {
rules = "usb_video.bind"
- output = "usb_video_bind.h"
- tests = "tests.json"
+ output = "bind.h"
+ tests = "bind_tests.json"
deps = [ "//src/devices/bind/fuchsia.usb" ]
}
@@ -115,8 +115,10 @@
group("tests") {
testonly = true
- deps = [
- ":usb_video_bind_test",
- ":usb_video_test_package",
- ]
+ deps = [ ":usb_video_test_package" ]
+}
+
+group("bind_test") {
+ testonly = true
+ deps = [ ":usb_video_bind_test" ]
}
diff --git a/src/camera/drivers/usb_video/tests.json b/src/camera/drivers/usb_video/bind_tests.json
similarity index 100%
rename from src/camera/drivers/usb_video/tests.json
rename to src/camera/drivers/usb_video/bind_tests.json
diff --git a/src/camera/drivers/usb_video/usb_video.cc b/src/camera/drivers/usb_video/usb_video.cc
index f04065d..b8391db 100644
--- a/src/camera/drivers/usb_video/usb_video.cc
+++ b/src/camera/drivers/usb_video/usb_video.cc
@@ -15,7 +15,7 @@
#include <fbl/vector.h>
#include <usb/usb.h>
-#include "src/camera/drivers/usb_video/usb_video_bind.h"
+#include "src/camera/drivers/usb_video/bind.h"
#include "src/camera/drivers/usb_video/usb_video_stream.h"
#include "src/camera/drivers/usb_video/uvc_format.h"
