libpayload: initial test case + tiny "framework"
This adds a test case for using CBFS images that reside in RAM and a Makefile to run it (and maybe other tests in the future). The test concerns an issue in libcbfs when using x86 style CBFS images in non-canonical locations (eg. when loading CBFS images for processing). Use with "make run" inside the tests directory. Change-Id: I1af3792a1451728ff9594ba7f0410027cdecb59d Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: http://review.coreboot.org/2623 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
		
				
					committed by
					
						
						Stefan Reinauer
					
				
			
			
				
	
			
			
			
						parent
						
							b02c873190
						
					
				
				
					commit
					36b6f367c0
				
			
							
								
								
									
										13
									
								
								payloads/libpayload/tests/Makefile
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								payloads/libpayload/tests/Makefile
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,13 @@
 | 
			
		||||
CC=gcc -g -m32
 | 
			
		||||
INCLUDES=-I. -I../include -I../include/x86
 | 
			
		||||
TARGETS=cbfs-x86-test
 | 
			
		||||
 | 
			
		||||
cbfs-x86-test: cbfs-x86-test.c ../arch/x86/rom_media.c ../libcbfs/ram_media.c ../libcbfs/cbfs.c
 | 
			
		||||
	$(CC) -o $@ $^ $(INCLUDES)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
all: $(TARGETS)
 | 
			
		||||
 | 
			
		||||
run: all
 | 
			
		||||
	for i in $(TARGETS); do ./$$i; done
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										34
									
								
								payloads/libpayload/tests/cbfs-x86-test.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										34
									
								
								payloads/libpayload/tests/cbfs-x86-test.c
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,34 @@
 | 
			
		||||
/* system headers */
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
 | 
			
		||||
/* libpayload headers */
 | 
			
		||||
#include "cbfs.h"
 | 
			
		||||
 | 
			
		||||
int fail(const char* str)
 | 
			
		||||
{
 | 
			
		||||
	fprintf(stderr, "%s", str);
 | 
			
		||||
	exit(1);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int main(int argc, char** argv)
 | 
			
		||||
{
 | 
			
		||||
	FILE *cbfs = fopen("data/cbfs-x86.bin", "rb");
 | 
			
		||||
	if (!cbfs) fail("could not open test file\n");
 | 
			
		||||
	if (fseek(cbfs, 0, SEEK_END) != 0) fail("seek to end failed\n");
 | 
			
		||||
 | 
			
		||||
	long size = ftell(cbfs);
 | 
			
		||||
	if (size == -1) fail("could not determine file size\n");
 | 
			
		||||
	if (fseek(cbfs, 0, SEEK_SET) != 0) fail("seek to start failed\n");
 | 
			
		||||
 | 
			
		||||
	void *data = malloc(size);
 | 
			
		||||
	if (!data) fail("could not allocate buffer\n");
 | 
			
		||||
 | 
			
		||||
	if (fread(data, size, 1, cbfs) != 1) fail("could not read data\n");
 | 
			
		||||
	if (fclose(cbfs)) fail("could not close file\n");
 | 
			
		||||
 | 
			
		||||
	if (setup_cbfs_from_ram(data, size) != 0) fail("could not setup CBFS in RAM\n");
 | 
			
		||||
	struct cbfs_file *file = cbfs_find("foo");
 | 
			
		||||
	if (file == NULL) fail("could not find file in CBFS\n");
 | 
			
		||||
	exit(0);
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										
											BIN
										
									
								
								payloads/libpayload/tests/data/cbfs-x86.bin
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								payloads/libpayload/tests/data/cbfs-x86.bin
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										30
									
								
								payloads/libpayload/tests/libpayload-config.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								payloads/libpayload/tests/libpayload-config.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,30 @@
 | 
			
		||||
/*
 | 
			
		||||
 * Automatically generated C config: don't edit
 | 
			
		||||
 * libpayload version: 0.2.0
 | 
			
		||||
 * Sat Mar  9 10:22:45 2013
 | 
			
		||||
 */
 | 
			
		||||
#define AUTOCONF_INCLUDED
 | 
			
		||||
#define CONFIG_SPEAKER 1
 | 
			
		||||
#define CONFIG_STORAGE 1
 | 
			
		||||
#define CONFIG_LIBC 1
 | 
			
		||||
#define CONFIG_CBFS 1
 | 
			
		||||
#define CONFIG_VGA_VIDEO_CONSOLE 1
 | 
			
		||||
#define CONFIG_SERIAL_CONSOLE 1
 | 
			
		||||
#define CONFIG_PC_KEYBOARD 1
 | 
			
		||||
#define CONFIG_ARCH_X86 1
 | 
			
		||||
#define CONFIG_STORAGE_ATA 1
 | 
			
		||||
#define CONFIG_ARCH_SPECIFIC_OPTIONS 1
 | 
			
		||||
#define CONFIG_STORAGE_AHCI_ONLY_TESTED 1
 | 
			
		||||
#define CONFIG_X86_SERIAL_CONSOLE 1
 | 
			
		||||
#define CONFIG_PDCURSES 1
 | 
			
		||||
#define CONFIG_NVRAM 1
 | 
			
		||||
#define CONFIG_PC_KEYBOARD_LAYOUT_US 1
 | 
			
		||||
#define CONFIG_STORAGE_AHCI 1
 | 
			
		||||
#define CONFIG_MULTIBOOT 1
 | 
			
		||||
#define CONFIG_SERIAL_IOBASE 0x3f8
 | 
			
		||||
#define CONFIG_CURSES 1
 | 
			
		||||
#define CONFIG_CBMEM_CONSOLE 1
 | 
			
		||||
#define CONFIG_LITTLE_ENDIAN 1
 | 
			
		||||
#define CONFIG_PCI 1
 | 
			
		||||
#define CONFIG_STORAGE_ATAPI 1
 | 
			
		||||
#define CONFIG_VIDEO_CONSOLE 1
 | 
			
		||||
		Reference in New Issue
	
	Block a user