efi_selftest: fix HII tests
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Wed, 23 Jan 2019 19:36:27 +0000 (20:36 +0100)
committerAlexander Graf <agraf@suse.de>
Wed, 13 Feb 2019 08:40:06 +0000 (09:40 +0100)
efi_st_printf() does not support format code %ld. Anyway the format code
for size_t would be %zu which isn't supported either.

We do not want any divisions to avoid invalid references to integer
arithmetic routines, cf.
https://gcc.gnu.org/onlinedocs/gccint/Integer-library-routines.html.

As a simple remedy remove the noisy messages from the output.
They are not relevant for automated testing.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
lib/efi_selftest/efi_selftest_hii.c

index 16d7b608297eebc469c38e85a2ddf9f12030d6cf..e38af7dbf858d37e9beeaa734779521450495ca9 100644 (file)
@@ -205,8 +205,6 @@ static int test_hii_database_list_package_lists(void)
                             (unsigned int)ret);
                goto out;
        }
-       efi_st_printf("list_package_lists returned %ld handles\n",
-                     handles_size / sizeof(*handles));
        free(handles);
 
        /* STRINGS */
@@ -236,8 +234,6 @@ static int test_hii_database_list_package_lists(void)
                ret = EFI_ST_FAILURE;
                goto out;
        }
-       efi_st_printf("list_package_lists returned %ld strings handles\n",
-                     handles_size / sizeof(*handles));
        free(handles);
 
        /* GUID */
@@ -267,8 +263,6 @@ static int test_hii_database_list_package_lists(void)
                ret = EFI_ST_FAILURE;
                goto out;
        }
-       efi_st_printf("list_package_lists returned %ld guid handles\n",
-                     handles_size / sizeof(*handles));
        free(handles);
 
        /* KEYBOARD_LAYOUT */
@@ -298,8 +292,6 @@ static int test_hii_database_list_package_lists(void)
                ret = EFI_ST_FAILURE;
                goto out;
        }
-       efi_st_printf("list_package_lists returned %ld keyboard layout handles\n",
-                     handles_size / sizeof(*handles));
        free(handles);
 
        result = EFI_ST_SUCCESS;
@@ -420,9 +412,6 @@ static int test_hii_database_find_keyboard_layouts(void)
        }
        free(guids);
 
-       efi_st_printf("find_keyboard_layouts returned %ld guids\n",
-                     guids_size / sizeof(*guids));
-
        result = EFI_ST_SUCCESS;
 
 out: