diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2018-04-16 07:59:03 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2018-04-23 21:34:28 +0200 |
| commit | b5cd6878e43f913ae31c80425e410ca975082b4a (patch) | |
| tree | e9cafebe5e3c7499c072fd7aadd61fb922d62ac6 /lib | |
| parent | c524997acb3d322e1bbd36c06ad02ef589705e7c (diff) | |
| download | u-boot-b5cd6878e43f913ae31c80425e410ca975082b4a.zip u-boot-b5cd6878e43f913ae31c80425e410ca975082b4a.tar.gz u-boot-b5cd6878e43f913ae31c80425e410ca975082b4a.tar.bz2 | |
efi_selftest: do not execute test if setup failed
Executing a test after failed setup may lead to unexpected behavior like
an illegal memory access. So after a setup failure we should skip to
teardown.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi_selftest/efi_selftest.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/efi_selftest/efi_selftest.c b/lib/efi_selftest/efi_selftest.c index fc5ef25..fd4fee7 100644 --- a/lib/efi_selftest/efi_selftest.c +++ b/lib/efi_selftest/efi_selftest.c @@ -77,20 +77,20 @@ void efi_st_exit_boot_services(void) */ static int setup(struct efi_unit_test *test, unsigned int *failures) { - int ret; - - if (!test->setup) + if (!test->setup) { + test->setup_ok = EFI_ST_SUCCESS; return EFI_ST_SUCCESS; + } efi_st_printc(EFI_LIGHTBLUE, "\nSetting up '%s'\n", test->name); - ret = test->setup(handle, systable); - if (ret != EFI_ST_SUCCESS) { + test->setup_ok = test->setup(handle, systable); + if (test->setup_ok != EFI_ST_SUCCESS) { efi_st_error("Setting up '%s' failed\n", test->name); ++*failures; } else { efi_st_printc(EFI_LIGHTGREEN, "Setting up '%s' succeeded\n", test->name); } - return ret; + return test->setup_ok; } /* @@ -200,7 +200,7 @@ void efi_st_do_tests(const u16 *testname, unsigned int phase, continue; if (steps & EFI_ST_SETUP) setup(test, failures); - if (steps & EFI_ST_EXECUTE) + if (steps & EFI_ST_EXECUTE && test->setup_ok == EFI_ST_SUCCESS) execute(test, failures); if (steps & EFI_ST_TEARDOWN) teardown(test, failures); |