Additional tests for Multiboot 2 print

This commit is contained in:
Alex Kotov 2020-11-29 17:57:34 +05:00
parent 70720e91be
commit 3d57f831f1
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
5 changed files with 295 additions and 7 deletions

3
.gitignore vendored
View File

@ -24,6 +24,7 @@
/tests/test*.log
/tests/test*.trs
/tests/multiboot2_print
/tests/multiboot2_print1
/tests/multiboot2_print2
/tests/test_multiboot2_print
/tests/test_multiboot2_validation

View File

@ -10,7 +10,8 @@ TESTS = \
noinst_PROGRAMS = \
$(TESTS) \
tests/multiboot2_print
tests/multiboot2_print1 \
tests/multiboot2_print2
libkernaux_a_SOURCES = \
src/arch/i386.S \
@ -18,9 +19,13 @@ libkernaux_a_SOURCES = \
src/multiboot2/print.c \
src/pfa.c
tests_multiboot2_print_SOURCES = \
tests_multiboot2_print1_SOURCES = \
$(libkernaux_a_SOURCES) \
tests/multiboot2_print.c
tests/multiboot2_print1.c
tests_multiboot2_print2_SOURCES = \
$(libkernaux_a_SOURCES) \
tests/multiboot2_print2.c
tests_test_multiboot2_print_SOURCES = \
$(libkernaux_a_SOURCES) \

View File

@ -1,5 +1,6 @@
#include <kernaux/multiboot2.h>
#include <assert.h>
#include <stdio.h>
static const unsigned char multiboot2_example[864] = {
@ -61,6 +62,10 @@ static const unsigned char multiboot2_example[864] = {
int main()
{
assert(KernAux_Multiboot2_is_valid(
(struct KernAux_Multiboot2*)multiboot2_example
));
KernAux_Multiboot2_print(
(struct KernAux_Multiboot2*)multiboot2_example,
(void (*)(const char *format, ...))printf

277
tests/multiboot2_print2.c Normal file
View File

@ -0,0 +1,277 @@
// TODO: finish example data and test printing
#include <kernaux/multiboot2.h>
#include <assert.h>
#include <stdio.h>
static const struct {
struct KernAux_Multiboot2 multiboot2;
struct {
struct KernAux_Multiboot2_Tag_BootCmdLine tag;
char cmdline[15];
} tag_boot_cmd_line;
unsigned char _align1[1];
struct {
struct KernAux_Multiboot2_Tag_BootLoaderName tag;
char name[22];
} tag_boot_loader_name;
unsigned char _align2[2];
struct {
struct KernAux_Multiboot2_Tag_Module tag;
char cmdline[17];
} tag_module1;
unsigned char _align3[7];
struct {
struct KernAux_Multiboot2_Tag_Module tag;
char cmdline[17];
} tag_module2;
unsigned char _align4[7];
struct KernAux_Multiboot2_Tag_BasicMemoryInfo tag_basic_memory_info;
struct KernAux_Multiboot2_Tag_BIOSBootDevice tag_bios_boot_device;
unsigned char _align5[4];
struct {
struct KernAux_Multiboot2_Tag_MemoryMap tag;
unsigned char
data[160 - sizeof(struct KernAux_Multiboot2_Tag_MemoryMap)];
} tag_memory_map;
struct KernAux_Multiboot2_Tag_VBEInfo tag_vbe_info;
struct {
struct KernAux_Multiboot2_Tag_FramebufferInfo tag;
unsigned char data[8];
} tag_framebuffer_info;
unsigned char _align6[1];
struct {
struct KernAux_Multiboot2_Tag_ELFSymbols tag;
unsigned char
data[420 - sizeof(struct KernAux_Multiboot2_Tag_ELFSymbols)];
} tag_elf_symbols;
unsigned char _align7[4];
struct KernAux_Multiboot2_Tag_APMTable tag_apm_table;
unsigned char _align8[4];
struct KernAux_Multiboot2_Tag_EFI32bitSystemTablePtr tag_efi_32bit_system_table_ptr;
unsigned char _align9[4];
struct KernAux_Multiboot2_Tag_EFI64bitSystemTablePtr tag_efi_64bit_system_table_ptr;
struct KernAux_Multiboot2_Tag_None tag_none;
} multiboot2_example = {
.multiboot2 = {
.total_size = sizeof(multiboot2_example),
.reserved1 = 0,
},
.tag_boot_cmd_line = {
.tag = {
.base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_BOOT_CMD_LINE,
.size = sizeof(multiboot2_example.tag_boot_cmd_line),
},
},
.cmdline = "Hello, Kernel!\0",
},
.tag_boot_loader_name = {
.tag = {
.base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_BOOT_LOADER_NAME,
.size = sizeof(multiboot2_example.tag_boot_loader_name),
},
},
.name = "GRUB 2.02-2ubuntu8.20\0",
},
.tag_module1 = {
.tag = {
.base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_MODULE,
.size = sizeof(multiboot2_example.tag_module1),
},
.mod_start = 123,
.mod_end = 456,
},
.cmdline = "Hello, Module 1!\0",
},
.tag_module2 = {
.tag = {
.base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_MODULE,
.size = sizeof(multiboot2_example.tag_module2),
},
.mod_start = 123,
.mod_end = 456,
},
.cmdline = "Hello, Module 2!\0",
},
.tag_basic_memory_info = {
.base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_BASIC_MEMORY_INFO,
.size = sizeof(multiboot2_example.tag_basic_memory_info),
},
.mem_lower = 123,
.mem_upper = 456,
},
.tag_bios_boot_device = {
.base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_BIOS_BOOT_DEVICE,
.size = sizeof(multiboot2_example.tag_bios_boot_device),
},
.bios_dev = 0,
.partition = 1,
.sub_partition = 2,
},
.tag_memory_map = {
.tag = {
.base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_MEMORY_MAP,
.size = sizeof(multiboot2_example.tag_memory_map),
},
.entry_size = 24,
.entry_version = 0,
},
.data = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 252, 9, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
0, 252, 9, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0,
2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,
0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 238, 7, 0, 0, 0, 0,
1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, 7, 0, 0, 0, 0,
0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,
0, 0, 252, 255, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0,
2, 0, 0, 0, 0, 0, 0, 0,
},
},
.tag_vbe_info = {
.base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_VBE_INFO,
.size = sizeof(multiboot2_example.tag_vbe_info),
},
.vbe_mode = 0,
.vbe_interface_seg = 123,
.vbe_interface_off = 456,
.vbe_interface_len = 789,
},
.tag_framebuffer_info = {
.tag = {
.base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_FRAMEBUFFER_INFO,
.size = sizeof(multiboot2_example.tag_framebuffer_info),
},
.framebuffer_addr = 123,
.framebuffer_pitch = 456,
.framebuffer_width = 123,
.framebuffer_height = 456,
.framebuffer_bpp = 8,
.framebuffer_type = 1,
},
.data = {0, 1, 2, 3, 4, 5, 6, 7},
},
.tag_elf_symbols = {
.tag = {
.base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_ELF_SYMBOLS,
.size = sizeof(multiboot2_example.tag_elf_symbols),
},
.num = 10,
.ent_size = 0,
.shndx = 40,
.reserved1 = 0,
},
.data = {
9, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 27, 0, 0, 0, 1, 0, 0, 0, 6, 0, 0, 0,
0, 0, 64, 0, 0, 16, 0, 0, 150, 53, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0,
1, 0, 0, 0, 2, 0, 0, 0, 0, 64, 64, 0, 0, 80, 0, 0,
8, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0,
0, 0, 0, 0, 41, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0,
8, 75, 64, 0, 8, 91, 0, 0, 132, 10, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 51, 0, 0, 0,
1, 0, 0, 0, 3, 0, 0, 0, 0, 96, 64, 0, 0, 112, 0, 0,
1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0,
0, 0, 0, 0, 57, 0, 0, 0, 8, 0, 0, 0, 3, 0, 0, 0,
0, 112, 64, 0, 1, 112, 0, 0, 64, 169, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 62, 0, 0, 0,
1, 0, 0, 0, 48, 0, 0, 0, 0, 0, 16, 0, 1, 112, 0, 0,
17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
1, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,
20, 0, 16, 0, 20, 112, 0, 0, 176, 12, 0, 0, 8, 0, 0, 0,
72, 0, 0, 0, 4, 0, 0, 0, 16, 0, 0, 0, 9, 0, 0, 0,
3, 0, 0, 0, 0, 0, 0, 0, 196, 12, 16, 0, 196, 124, 0, 0,
208, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
0, 0, 0, 0, 17, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0,
148, 26, 16, 0, 148, 138, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
},
},
.tag_apm_table = {
.base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_APM_TABLE,
.size = sizeof(multiboot2_example.tag_apm_table),
},
.version = 0,
.cseg = 123,
.offset = 456,
.cseg_16 = 789,
.dseg = 123,
.flags = 1,
.cseg_len = 456,
.cseg_16_len = 789,
.dseg_len = 123,
},
.tag_efi_32bit_system_table_ptr = {
.base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_EFI_32BIT_SYSTEM_TABLE_PTR,
.size = sizeof(multiboot2_example.tag_efi_32bit_system_table_ptr),
},
.pointer = 0,
},
.tag_efi_64bit_system_table_ptr = {
.base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_EFI_64BIT_SYSTEM_TABLE_PTR,
.size = sizeof(multiboot2_example.tag_efi_64bit_system_table_ptr),
},
.pointer = 0,
},
.tag_none = {
.base = {
.type = KERNAUX_MULTIBOOT2_TAGTYPE_NONE,
.size = sizeof(multiboot2_example.tag_none),
},
},
};
int main()
{
assert(KernAux_Multiboot2_is_valid(&multiboot2_example.multiboot2));
KernAux_Multiboot2_print(
&multiboot2_example.multiboot2,
(void (*)(const char *format, ...))printf
);
return 0;
}

View File

@ -3,7 +3,7 @@
#define __USE_POSIX2
#include <stdio.h>
static const char output[] =
static const char output1[] =
"Multiboot 2 info\n"
" size: 864\n"
" reserved1: 0\n"
@ -112,10 +112,10 @@ static const char output[] =
int main()
{
FILE *const fd = popen("tests/multiboot2_print", "r");
FILE *const fd = popen("tests/multiboot2_print1", "r");
assert(fd != NULL);
for (const char *ch = output; *ch; ++ch) {
for (const char *ch = output1; *ch; ++ch) {
assert(fgetc(fd) == *ch);
}