general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix test Makefile for SEFS

Browse Source
This commit is contained in:
WangRunji 2019-03-05 18:02:27 +08:00 committed by Tate Tian
parent d56378d96a
commit e41f65e132
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/sefs vendored

@ -1 +1 @@
Subproject commit 9b475b0efdb5a262938d716f4f619e47b6ce3d7f Subproject commit bffa92bb8d2571a15ab9e7d61e7330649fb74a7c

18
test/test_common.mk
View File

@ -11,6 +11,8 @@ BIN_NAME := bin
BIN_ENC_NAME := bin.encrypted BIN_ENC_NAME := bin.encrypted
OBJDUMP_FILE := bin.objdump OBJDUMP_FILE := bin.objdump
READELF_FILE := bin.readelf READELF_FILE := bin.readelf
FS_NAME := fs
SEFS_NAME := sefs
CLANG_BIN_PATH := $(shell clang -print-prog-name=clang) CLANG_BIN_PATH := $(shell clang -print-prog-name=clang)
LLVM_PATH := $(abspath $(dir $(CLANG_BIN_PATH))../) LLVM_PATH := $(abspath $(dir $(CLANG_BIN_PATH))../)
@ -25,7 +27,7 @@ LINK_FLAGS = $(C_FLAGS) $(EXTRA_LINK_FLAGS)
# Build # Build
############################################################################# #############################################################################
all: $(BIN_ENC_NAME) all: $(BIN_ENC_NAME) $(SEFS_NAME)
$(BIN_ENC_NAME): $(BIN_NAME) $(BIN_ENC_NAME): $(BIN_NAME)
@$(RM) -f $(BIN_ENC_NAME) @$(RM) -f $(BIN_ENC_NAME)
@ -36,6 +38,16 @@ $(BIN_ENC_NAME): $(BIN_NAME)
-k 123 > /dev/null -k 123 > /dev/null
@echo "GEN => $@" @echo "GEN => $@"
$(SEFS_NAME):
@mkdir -p $(FS_NAME)
@$(RM) -rf $(SEFS_NAME)
@cd $(PROJECT_DIR)/deps/sefs/sefs-fuse/bin/ && \
./app \
$(CUR_DIR)/$(SEFS_NAME) \
$(CUR_DIR)/$(FS_NAME) \
zip
@echo "SEFS => $@"
debug: $(OBJDUMP_FILE) $(READELF_FILE) debug: $(OBJDUMP_FILE) $(READELF_FILE)
$(OBJDUMP_FILE): $(BIN_NAME) $(OBJDUMP_FILE): $(BIN_NAME)
@ -59,7 +71,9 @@ $(C_OBJS): %.o: %.c
############################################################################# #############################################################################
test: $(BIN_ENC_NAME) test: $(BIN_ENC_NAME)
@cd ../ && RUST_BACKTRACE=1 ./pal $(CUR_DIR)/$(BIN_ENC_NAME) $(BIN_ARGS) # run test on current directory
@ln -sf ../pal ../libocclum.signed.so $(CUR_DIR)
@cd $(CUR_DIR) && RUST_BACKTRACE=1 ./pal $(BIN_ENC_NAME) $(BIN_ARGS)
############################################################################# #############################################################################
# Misc # Misc