aboutsummaryrefslogtreecommitdiffstats
path: root/tests/io_mock.h
diff options
context:
space:
mode:
authorAnastasia Klimchuk <aklm@chromium.org>2022-07-04 18:38:41 +1000
committerAnastasia Klimchuk <aklm@chromium.org>2022-07-10 22:29:04 +0000
commit06e73a8e61749c82ae9bd632113c01afd3ff2fd1 (patch)
tree1374c7e1aa292074241d3bf2a791d0cceeb6146c /tests/io_mock.h
parent94efa4454225ca09db5c12dfcd2b6057dd1682bf (diff)
downloadflashrom-06e73a8e61749c82ae9bd632113c01afd3ff2fd1.tar.gz
flashrom-06e73a8e61749c82ae9bd632113c01afd3ff2fd1.tar.bz2
flashrom-06e73a8e61749c82ae9bd632113c01afd3ff2fd1.zip
tests: Make libusb conditional dependency for unit tests
Unit tests had an unconditional dependency on libusb and this was a) strictly speaking not needed, b) blocking one build system effort. This patch is a temporary solution to unblock one build system effort, specifically CB:63724. It creates a condition so that libusb is only included when it is required, not always. This workaround is based on the fact that at the moment only 2 lifecycle unit tests are using libusb symbols: dediprog and raiden_debug. BUG=b:237606255 TEST=the following scenarios run tests successfully 1) dediprog and raiden_debug programmers enabled, libusb.h present result: all test run and pass 2) dediprog disabled, libusb.h present result: dediprog test skipped, all other tests run and pass 3) dediprog and raiden_debug both disabled, libusb.h changed to libusbabcd.h result: dediprog and raiden_debug tests are skipped, all other tests run and pass Change-Id: Iec8a1826951fd6ae586e90fde1a55170e7de41a8 Signed-off-by: Anastasia Klimchuk <aklm@chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/65627 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Singer <felixsinger@posteo.net> Reviewed-by: Thomas Heijligen <src@posteo.de>
Diffstat (limited to 'tests/io_mock.h')
-rw-r--r--tests/io_mock.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/io_mock.h b/tests/io_mock.h
index a36602a4..9e92a9d3 100644
--- a/tests/io_mock.h
+++ b/tests/io_mock.h
@@ -34,11 +34,9 @@
/* Required for `FILE *` */
#include <stdio.h>
-/*
- * Explicitly including the header because some tests are using libusb structs
- * in depth, opaque symbols are not sufficient.
- */
-#include <libusb.h>
+#include <stdint.h>
+
+#include "usb_unittests.h"
/* Address value needs fit into uint8_t. */
#define USB_DEVICE_ADDRESS 19