From e41f65e132cd245d52f98535460d805258733d87 Mon Sep 17 00:00:00 2001 From: WangRunji Date: Tue, 5 Mar 2019 18:02:27 +0800 Subject: [PATCH] fix test Makefile for SEFS --- deps/sefs | 2 +- test/test_common.mk | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/deps/sefs b/deps/sefs index 9b475b0e..bffa92bb 160000 --- a/deps/sefs +++ b/deps/sefs @@ -1 +1 @@ -Subproject commit 9b475b0efdb5a262938d716f4f619e47b6ce3d7f +Subproject commit bffa92bb8d2571a15ab9e7d61e7330649fb74a7c diff --git a/test/test_common.mk b/test/test_common.mk index 294ea4ce..faffd536 100644 --- a/test/test_common.mk +++ b/test/test_common.mk @@ -11,6 +11,8 @@ BIN_NAME := bin BIN_ENC_NAME := bin.encrypted OBJDUMP_FILE := bin.objdump READELF_FILE := bin.readelf +FS_NAME := fs +SEFS_NAME := sefs CLANG_BIN_PATH := $(shell clang -print-prog-name=clang) LLVM_PATH := $(abspath $(dir $(CLANG_BIN_PATH))../) @@ -25,7 +27,7 @@ LINK_FLAGS = $(C_FLAGS) $(EXTRA_LINK_FLAGS) # Build ############################################################################# -all: $(BIN_ENC_NAME) +all: $(BIN_ENC_NAME) $(SEFS_NAME) $(BIN_ENC_NAME): $(BIN_NAME) @$(RM) -f $(BIN_ENC_NAME) @@ -36,6 +38,16 @@ $(BIN_ENC_NAME): $(BIN_NAME) -k 123 > /dev/null @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) $(OBJDUMP_FILE): $(BIN_NAME) @@ -59,7 +71,9 @@ $(C_OBJS): %.o: %.c ############################################################################# 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