diff options
| author | Tom Rini <[email protected]> | 2023-05-14 11:27:18 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-05-14 11:27:18 -0400 |
| commit | 177e506952a8ee34011590c4bd578d191fafb1ca (patch) | |
| tree | 1c4be9b6329df4a1976125e87bf2fd8447990f29 /test/boot/bootdev.c | |
| parent | e94fbdd2729fdcd570035d43f67adda8e0dfc115 (diff) | |
| parent | fba0e7380269771bb9587fce84e56a059ebf7d42 (diff) | |
Merge branch '2023-05-13-bootstd-updates-and-improvements'
- Assorted bootstd fixes and cleanups. This should fix problems with
Debian, and make script-based distributions work when BOOTMETH_DISTRO
is enabled now (as BOOTMETH_DISTRO was renamed and then reintroduced).
Diffstat (limited to 'test/boot/bootdev.c')
| -rw-r--r-- | test/boot/bootdev.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/boot/bootdev.c b/test/boot/bootdev.c index 8cf3f30e0f7..6b29213416d 100644 --- a/test/boot/bootdev.c +++ b/test/boot/bootdev.c @@ -19,9 +19,9 @@ /* Allow reseting the USB-started flag */ #if defined(CONFIG_USB_HOST) || defined(CONFIG_USB_GADGET) -extern char usb_started; +extern bool usb_started; #else -char usb_started; +#include <usb.h> #endif /* Check 'bootdev list' command */ @@ -306,6 +306,7 @@ static int bootdev_test_hunter(struct unit_test_state *uts) { struct bootstd_priv *std; + usb_started = false; test_set_skip_delays(true); /* get access to the used hunters */ @@ -346,6 +347,7 @@ static int bootdev_test_cmd_hunt(struct unit_test_state *uts) struct bootstd_priv *std; test_set_skip_delays(true); + usb_started = false; /* get access to the used hunters */ ut_assertok(bootstd_get_priv(&std)); @@ -474,6 +476,7 @@ BOOTSTD_TEST(bootdev_test_bootable, UT_TESTF_DM | UT_TESTF_SCAN_FDT); /* Check hunting for bootdev of a particular priority */ static int bootdev_test_hunt_prio(struct unit_test_state *uts) { + usb_started = false; test_set_skip_delays(true); console_record_reset_enable(); @@ -502,6 +505,8 @@ static int bootdev_test_hunt_label(struct unit_test_state *uts) struct bootstd_priv *std; int mflags; + usb_started = false; + /* get access to the used hunters */ ut_assertok(bootstd_get_priv(&std)); |