-
Notifications
You must be signed in to change notification settings - Fork 123
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #170 from keystone-enclave/build-system
Allow out-of-tree builds for tests, clean up CMakeLists
- Loading branch information
Showing
8 changed files
with
204 additions
and
163 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,60 @@ | ||
| CC = riscv64-unknown-linux-gnu-g++ | ||
| OBJCOPY = riscv64-unknown-linux-gnu-objcopy | ||
| CC := riscv64-unknown-linux-gnu-g++ | ||
| OBJCOPY := riscv64-unknown-linux-gnu-objcopy | ||
|
|
||
| SDK_LIB_DIR =$(KEYSTONE_SDK_DIR)/lib | ||
| SDK_HOST_LIB = $(SDK_LIB_DIR)/libkeystone-host.a | ||
| SDK_EDGE_LIB = $(SDK_LIB_DIR)/libkeystone-edge.a | ||
| SDK_VERIFIER_LIB = $(SDK_LIB_DIR)/libkeystone-verifier.a | ||
| SDK_LIB_DIR := $(KEYSTONE_SDK_DIR)/lib | ||
| SDK_HOST_LIB := $(SDK_LIB_DIR)/libkeystone-host.a | ||
| SDK_EDGE_LIB := $(SDK_LIB_DIR)/libkeystone-edge.a | ||
| SDK_VERIFIER_LIB := $(SDK_LIB_DIR)/libkeystone-verifier.a | ||
|
|
||
| SDK_INCLUDE_HOST_DIR = $(SDK_LIB_DIR)/host/include | ||
| SDK_INCLUDE_EDGE_DIR = $(SDK_LIB_DIR)/edge/include | ||
| SDK_INCLUDE_VERIFIER_DIR = $(SDK_LIB_DIR)/verifier | ||
| SDK_INCLUDE_HOST_DIR := $(SDK_LIB_DIR)/host/include | ||
| SDK_INCLUDE_EDGE_DIR := $(SDK_LIB_DIR)/edge/include | ||
| SDK_INCLUDE_VERIFIER_DIR := $(SDK_LIB_DIR)/verifier | ||
|
|
||
| RUNTIME=eyrie-rt | ||
| RUNNER=test-runner.riscv | ||
| CCFLAGS = -I$(SDK_INCLUDE_HOST_DIR) -I$(SDK_INCLUDE_EDGE_DIR) -I$(SDK_INCLUDE_VERIFIER_DIR) -std=c++11 | ||
| LDFLAGS = -L$(SDK_LIB_DIR) | ||
| O := $(shell pwd) | ||
|
|
||
| RUNTIME := eyrie-rt | ||
| RUNNER := test-runner.riscv | ||
| CCFLAGS := -I$(SDK_INCLUDE_HOST_DIR) -I$(SDK_INCLUDE_EDGE_DIR) -I$(SDK_INCLUDE_VERIFIER_DIR) -std=c++11 | ||
| LDFLAGS := -L$(SDK_LIB_DIR) | ||
|
|
||
| TESTS=stack fibonacci long-nop loop malloc fib-bench untrusted attestation | ||
|
|
||
| SRCS = $(patsubst %.riscv, %.cpp, $(RUNNER)) | ||
| OBJS = $(patsubst %.riscv, %.o,$(RUNNER)) $(KEYSTONE_OBJ) edge_wrapper.o | ||
| OBJS := $(patsubst %.riscv, %.o,$(RUNNER)) $(KEYSTONE_OBJ) edge_wrapper.o | ||
| SRCS := $(patsubst %.o, %.cpp, $(OBJS)) | ||
|
|
||
| DST_OBJS := $(addprefix $(O)/, $(OBJS)) | ||
| DST_RUNNER := $(O)/$(RUNNER) | ||
| DST_TEST_SCRIPT := $(O)/test | ||
|
|
||
| .PHONY: all clean tests | ||
|
|
||
| all: $(OBJS) $(SDK_HOST_LIB) $(SDK_EDGE_LIB) $(SDK_VERIFIER_LIB) | ||
| $(CC) $(CCFLAGS) $(LDFLAGS) -o $(RUNNER) $^ | ||
| all: $(DST_RUNNER) tests | ||
|
|
||
| tests $(DST_TEST_SCRIPT): | ||
| $(foreach test, $(TESTS),\ | ||
| $(MAKE) -C $(test);\ | ||
| $(MAKE) -C $(test) O=$(O)/$(test) ;\ | ||
| ) | ||
| rm -f test | ||
| rm -f $(DST_TEST_SCRIPT) | ||
| $(foreach test, $(TESTS), \ | ||
| echo "echo 'testing $(test)'" >> test;\ | ||
| echo "./$(RUNNER) $(test).eapp_riscv $(RUNTIME)" >> test; \ | ||
| echo '[ $$? -eq 0 ] || echo "... ERROR"' >> test; \ | ||
| echo "echo 'testing $(test)'" >> $(DST_TEST_SCRIPT) ;\ | ||
| echo "./$(RUNNER) $(test).eapp_riscv $(RUNTIME)" >> $(DST_TEST_SCRIPT) ;\ | ||
| echo '[ $$? -eq 0 ] || echo "... ERROR"' >> $(DST_TEST_SCRIPT) ;\ | ||
| ) | ||
| chmod +x test | ||
| chmod +x $(DST_TEST_SCRIPT) | ||
|
|
||
| $(DST_RUNNER): $(DST_OBJS) $(SDK_HOST_LIB) $(SDK_EDGE_LIB) $(SDK_VERIFIER_LIB) | ||
| $(CC) $(CCFLAGS) $(LDFLAGS) -o $(DST_RUNNER) $^ | ||
|
|
||
| $(SDK_HOST_LIB): | ||
| $(MAKE) -C $(SDK_HOST_DIR) | ||
|
|
||
| $(OBJS): %.o: %.cpp | ||
| $(CC) $(CCFLAGS) -c $< | ||
| $(DST_OBJS): $(O)/%.o: %.cpp | ||
| @mkdir -p $(O) | ||
| $(CC) $(CCFLAGS) -c $< -o $@ | ||
|
|
||
| clean: | ||
| rm -f *.o *.riscv test | ||
| rm -f $(DST_OBJS) $(DST_RUNNER) $(DST_TEST_SCRIPT) | ||
| $(foreach test, $(TESTS), \ | ||
| $(MAKE) -C $(test) clean; \ | ||
| $(MAKE) -C $(test) O=$(O)/$(test) clean; \ | ||
| ) | ||
| rm -d $(O) 2>&1 || true |
Oops, something went wrong.