diff options
| author | Gaurav Shah <gauravsh@chromium.org> | 2010-03-31 13:26:55 -0700 |
|---|---|---|
| committer | Gaurav Shah <gauravsh@chromium.org> | 2010-03-31 13:26:55 -0700 |
| commit | fc70d72aaab4d558e39ec43832375267603bfd93 (patch) | |
| tree | 2b71e90cdb26c079a76ab82607e9bf7a7c97e6ff /tests | |
| parent | 5411c7a9f03f91bf2c1cd1cf852db9d4585a05c9 (diff) | |
| download | vboot-fc70d72aaab4d558e39ec43832375267603bfd93.tar.gz | |
VBoot Reference: Refactoring Part 3
Refactor and restructure reference code into individual self-contain modules. I have revamped the way the code is structured to make it easy to determine which parts belong in the firmware and which are used by userland tools.
common/ - common utilities and stub functions (Firmware)
cryptolib/ - crypto library (Firmware)
misclibs/ - miscellaneous userland libraries (Userland)
sctips/ - Miscellaenous scripts (Userland)
tests/ - Tests (Userland)
vfirmware/ - Verified Firmware Implementation
vfirmware/firmware_image_fw.c (Firmware)
vfirmware/firmware_image.c (Userland)
vkernel/ - Verified Kernel Implementation
vkernel/kernel_image_fw.c (Firmware)
vkernel/kernel_image.c (Userland)
Review URL: http://codereview.chromium.org/1581005
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 21 | ||||
| -rwxr-xr-x | tests/common.sh | 2 |
2 files changed, 13 insertions, 10 deletions
diff --git a/tests/Makefile b/tests/Makefile index 99e2d3a4..b14f74f6 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -4,15 +4,18 @@ CC ?= gcc CFLAGS ?= -Wall -DNDEBUG -O3 -Werror -INCLUDES ?= -I../include/ -TOP ?= ../ - -BASE_LIBS = $(TOP)/crypto/libcrypto.a $(TOP)/common/libcommon.a -IMAGE_LIBS = $(TOP)/utils/firmware_image.o \ - $(TOP)/utils/firmware_image_fw.o \ - $(TOP)/utils/kernel_image.o \ - $(TOP)/utils/kernel_image_fw.o -UTIL_LIBS = $(TOP)/utils/file_keys.o $(TOP)/utils/signature_digest.o +INCLUDES += -I./include \ + -I../cryptolib/include \ + -I../common/include \ + -I../misclibs/include \ + -I../vfirmware/include\ + -I../vkernel/include +BASE_LIBS = $(TOP)/cryptolib/libcrypto.a $(TOP)/common/libcommon.a +IMAGE_LIBS = $(TOP)/vfirmware/firmware_image.o \ + $(TOP)/vfirmware/firmware_image_fw.o \ + $(TOP)/vkernel/kernel_image.o \ + $(TOP)/vkernel/kernel_image_fw.o +UTIL_LIBS = $(TOP)/misclibs/file_keys.o $(TOP)/misclibs/signature_digest.o LIBS = $(IMAGE_LIBS) $(UTIL_LIBS) -lcrypto $(BASE_LIBS) TEST_BINS = big_firmware_tests \ diff --git a/tests/common.sh b/tests/common.sh index 82fdb850..421f6290 100755 --- a/tests/common.sh +++ b/tests/common.sh @@ -15,7 +15,7 @@ else SCRIPT_DIR="`pwd`"/"`dirname $0`" fi -UTIL_DIR=`dirname ${SCRIPT_DIR}`/utils +UTIL_DIR=`dirname ${SCRIPT_DIR}`/utility TEST_DIR=${SCRIPT_DIR} TESTKEY_DIR=${SCRIPT_DIR}/testkeys TESTCASE_DIR=${SCRIPT_DIR}/testcases |