diff options
| author | Tom Rini | 2021-03-29 17:53:19 -0400 |
|---|---|---|
| committer | Tom Rini | 2021-03-29 18:00:21 -0400 |
| commit | 1057b1be75386e3513dca392d8258e01e5cccc01 (patch) | |
| tree | a1cbdc677c070064177e1d9defeb1fb4ab30ad6e /test | |
| parent | 4906238191b90be7aec2269ba8cd6aeb161cd312 (diff) | |
| parent | d8eafb16c85bc3b5d85d7ba8ebb1438cc0ae168f (diff) | |
Merge tag 'v2021.04-rc5' into next
Prepare v2021.04-rc5
Diffstat (limited to 'test')
| -rw-r--r-- | test/print_ut.c | 2 | ||||
| -rw-r--r-- | test/py/tests/test_env.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/print_ut.c b/test/print_ut.c index 61ea432e46a..5b0a46de9c3 100644 --- a/test/print_ut.c +++ b/test/print_ut.c @@ -7,9 +7,7 @@ #include <common.h> #include <command.h> -#if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD) #include <efi_api.h> -#endif #include <display_options.h> #include <log.h> #include <version.h> diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py index 940279651da..9bed2f48d77 100644 --- a/test/py/tests/test_env.py +++ b/test/py/tests/test_env.py @@ -414,6 +414,8 @@ def mk_env_ext4(state_test_env): if os.path.exists(persistent): c.log.action('Disk image file ' + persistent + ' already exists') else: + # Some distributions do not add /sbin to the default PATH, where mkfs.ext4 lives + os.environ["PATH"] += os.pathsep + '/sbin' try: u_boot_utils.run_and_log(c, 'dd if=/dev/zero of=%s bs=1M count=16' % persistent) u_boot_utils.run_and_log(c, 'mkfs.ext4 %s' % persistent) |