diff options
| author | Yicheng Li <yichengli@chromium.org> | 2020-09-11 12:33:07 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-09-14 23:42:34 +0000 |
| commit | 16176c70547ef9777cc04db3d201ccadf900639f (patch) | |
| tree | 01fde2c99ae7f659c182eee253188723581152ab /driver/fingerprint | |
| parent | 892164121da43c54c5e1483685b586b302f87442 (diff) | |
| download | chrome-ec-16176c70547ef9777cc04db3d201ccadf900639f.tar.gz | |
fpsensor: Do not compile driver invocations for public unittest builds
If HAVE_FP_PRIVATE_DRIVER is defined, the build will compile fingerprint
driver routines when compiling "common/fpsensor/fpsensor.c". Previously
we enable HAVE_FP_PRIVATE_DRIVER for both public and private unittest
builds. This was because we wanted to test "common/fpsensor/fpsensor.c"
with our mocks. However on public unittest builds this will break. This
change limits the compilation of driver-related code to private builds.
BRANCH=none
BUG=b:166807240, b:158580909
TEST=make -j buildall
TEST=make -j BOARD=bloonchipper test-rsa (private build)
TEST=mv private private-2 (hide private directory)
make -j BOARD=bloonchipper clean
make -j BOARD=bloonchipper test-rsa (public build)
Signed-off-by: Yicheng Li <yichengli@chromium.org>
Change-Id: Id144435bf1a60c259f4c1b120b9fc85ef85b7f4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2406189
Commit-Queue: Tom Hughes <tomhughes@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Diffstat (limited to 'driver/fingerprint')
| -rw-r--r-- | driver/fingerprint/fpsensor.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/driver/fingerprint/fpsensor.h b/driver/fingerprint/fpsensor.h index 5dcadccbd6..44d989df13 100644 --- a/driver/fingerprint/fpsensor.h +++ b/driver/fingerprint/fpsensor.h @@ -18,8 +18,11 @@ #define FP_MAX_FINGER_COUNT 5 #endif -#ifdef TEST_BUILD -/* This represents the mock of the private */ +#if defined(HAVE_PRIVATE) && defined(TEST_BUILD) +/* + * For unittest in a private build, enable driver-related code in + * common/fpsensor/ so that they can be tested (with fp_sensor_mock). + */ #define HAVE_FP_PRIVATE_DRIVER #endif |