Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xtest: regression 1100: add OCALL tests #434

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+1,206 −1
Open

xtest: regression 1100: add OCALL tests #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/host/xtest \
$(LOCAL_PATH)/ta/aes_perf/include \
$(LOCAL_PATH)/ta/socket/include \
$(LOCAL_PATH)/ta/sdp_basic/include \
$(LOCAL_PATH)/ta/tpm_log_test/include
$(LOCAL_PATH)/ta/tpm_log_test/include \
$(LOCAL_PATH)/ta/ocall/include

# Include configuration file generated by OP-TEE OS (CFG_* macros)
LOCAL_CFLAGS += -I $(TA_DEV_KIT_DIR)/host_include -include conf.h
Expand Down
4 changes: 4 additions & 0 deletions host/xtest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ if (CFG_PKCS11_TA)
list (APPEND SRC pkcs11_1000.c)
endif()

if (CFG_OCALL)
list (APPEND SRC regression_1100.c)
endif()

################################################################################
# Built binary
################################################################################
Expand Down
5 changes: 5 additions & 0 deletions host/xtest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ CFLAGS += -I$(OPTEE_PKCS11_TA_HEADERS)
LDFLAGS += -L$(OPTEE_CLIENT_EXPORT)/lib -lckteec
endif

ifeq ($(CFG_OCALL),y)
srcs += regression_1100.c
endif

objs := $(patsubst %.c,$(out-dir)/xtest/%.o, $(srcs))

CFLAGS += -I./
Expand Down Expand Up @@ -128,6 +132,7 @@ CFLAGS += -I../../ta/socket/include
CFLAGS += -I../../ta/sdp_basic/include
CFLAGS += -I../../ta/tpm_log_test/include
CFLAGS += -I../../ta/supp_plugin/include
CFLAGS += -I../../ta/ocall/include

TA_DIR ?= /lib/optee_armtz
CFLAGS += -DTA_DIR=\"$(TA_DIR)\"
Expand Down