Merge branch '2020-05-18-reduce-size-of-common.h'

[oweals/u-boot.git] / test / print_ut.c

diff --git a/test/print_ut.c b/test/print_ut.c
index d8e9da8fa8f4141235ac01d7d1654f5b6314b1f7..a456a449efab784cc4e9e9cb5aee86f78519b822 100644 (file)
--- a/test/print_ut.c
+++ b/test/print_ut.c
@@ -1,27 +1,46 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2012, The Chromium Authors
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #define DEBUG
 
 #include <common.h>
-#if defined(CONFIG_EFI_LOADER) && \
-       !defined(CONFIG_SPL_BUILD) && !defined(API_BUILD)
+#if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD)
+#include <command.h>
 #include <efi_api.h>
 #endif
 #include <display_options.h>
+#include <log.h>
 #include <version.h>
 
 #define FAKE_BUILD_TAG "jenkins-u-boot-denx_uboot_dm-master-build-aarch64" \
                        "and a lot more text to come"
 
+/* Test printing GUIDs */
+static void guid_ut_print(void)
+{
+#if CONFIG_IS_ENABLED(LIB_UUID)
+       unsigned char guid[16] = {
+               1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
+       };
+       char str[40];
+
+       sprintf(str, "%pUb", guid);
+       assert(!strcmp("01020304-0506-0708-090a-0b0c0d0e0f10", str));
+       sprintf(str, "%pUB", guid);
+       assert(!strcmp("01020304-0506-0708-090A-0B0C0D0E0F10", str));
+       sprintf(str, "%pUl", guid);
+       assert(!strcmp("04030201-0605-0807-090a-0b0c0d0e0f10", str));
+       sprintf(str, "%pUL", guid);
+       assert(!strcmp("04030201-0605-0807-090A-0B0C0D0E0F10", str));
+#endif
+}
+
 /* Test efi_loader specific printing */
 static void efi_ut_print(void)
 {
-#if defined(CONFIG_EFI_LOADER) && \
-    !defined(CONFIG_SPL_BUILD) && !defined(API_BUILD)
+#if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD)
        char str[10];
        u8 buf[sizeof(struct efi_device_path_sd_mmc_path) +
               sizeof(struct efi_device_path)];
@@ -51,7 +70,7 @@ static void efi_ut_print(void)
 #endif
 }
 
-static int do_ut_print(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_ut_print(struct cmd_tbl *cmdtp, int flag, int argc,
                       char *const argv[])
 {
        char big_str[400];
@@ -82,14 +101,18 @@ static int do_ut_print(cmd_tbl_t *cmdtp, int flag, int argc,
        assert(s == str);
        assert(!strcmp("\n\nU-Boo\n\n", s));
 
-       s = display_options_get_banner(true, str, 1);
-       assert(s == str);
-       assert(!strcmp("", s));
+       /* Assert that we do not overwrite memory before the buffer */
+       str[0] = '`';
+       s = display_options_get_banner(true, str + 1, 1);
+       assert(s == str + 1);
+       assert(!strcmp("`", str));
 
-       s = display_options_get_banner(true, str, 2);
-       assert(s == str);
-       assert(!strcmp("\n", s));
+       str[0] = '~';
+       s = display_options_get_banner(true, str + 1, 2);
+       assert(s == str + 1);
+       assert(!strcmp("~\n", str));
 
+       /* The last two characters are set to \n\n for all buffer sizes > 2 */
        s = display_options_get_banner(false, str, sizeof(str));
        assert(s == str);
        assert(!strcmp("U-Boot \n\n", s));
@@ -116,6 +139,9 @@ static int do_ut_print(cmd_tbl_t *cmdtp, int flag, int argc,
        /* Test efi_loader specific printing */
        efi_ut_print();
 
+       /* Test printing GUIDs */
+       guid_ut_print();
+
        printf("%s: Everything went swimmingly\n", __func__);
        return 0;
 }