]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
efi_selftest: adjust runtime test for variables
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Mon, 6 Jul 2020 15:06:07 +0000 (17:06 +0200)
committerHeinrich Schuchardt <xypron.glpk@gmx.de>
Sat, 11 Jul 2020 21:14:17 +0000 (23:14 +0200)
As variable services are available at runtime we have to expect EFI_SUCCESS
when calling the services.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
lib/efi_selftest/efi_selftest_variables_runtime.c

index b3b40ad2cfc2129e236fbfab3e1eeafd59b253ce..3226069c0b21bd8b33024bd1e19600756b58475f 100644 (file)
@@ -16,9 +16,7 @@
 
 static struct efi_boot_services *boottime;
 static struct efi_runtime_services *runtime;
-static const efi_guid_t guid_vendor0 =
-       EFI_GUID(0x67029eb5, 0x0af2, 0xf6b1,
-                0xda, 0x53, 0xfc, 0xb5, 0x66, 0xdd, 0x1c, 0xe6);
+static const efi_guid_t guid_vendor0 = EFI_GLOBAL_VARIABLE_GUID;
 
 /*
  * Setup unit test.
@@ -68,17 +66,18 @@ static int execute(void)
                efi_st_error("SetVariable failed\n");
                return EFI_ST_FAILURE;
        }
-       len = 3;
-       ret = runtime->get_variable(L"efi_st_var0", &guid_vendor0,
+       len = EFI_ST_MAX_DATA_SIZE;
+       ret = runtime->get_variable(L"PlatformLangCodes", &guid_vendor0,
                                    &attr, &len, data);
-       if (ret != EFI_UNSUPPORTED) {
+       if (ret != EFI_SUCCESS) {
                efi_st_error("GetVariable failed\n");
                return EFI_ST_FAILURE;
        }
        memset(&guid, 0, 16);
        *varname = 0;
+       len = 2 * EFI_ST_MAX_VARNAME_SIZE;
        ret = runtime->get_next_variable_name(&len, varname, &guid);
-       if (ret != EFI_UNSUPPORTED) {
+       if (ret != EFI_SUCCESS) {
                efi_st_error("GetNextVariableName failed\n");
                return EFI_ST_FAILURE;
        }