summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7f16107)
raw | patch | inline | side by side (parent: 7f16107)
author | Victor Chong <victor.chong@linaro.org> | |
Fri, 3 Feb 2017 12:35:25 +0000 (12:35 +0000) | ||
committer | Victor Chong <victor.chong@linaro.org> | |
Tue, 7 Feb 2017 16:47:11 +0000 (16:47 +0000) |
Match TA_TEST_DIR in optee_test/blob/master/host/xtest/xtest_1000.c
Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
diff --git a/config.mk b/config.mk
index 2cffc55350f370087f61730a15741de8d0f3b04b..2d188bf36befb5703b20449ad7978337971af9bf 100644 (file)
--- a/config.mk
+++ b/config.mk
# Enable the tee test path. When enabled, the supplicant will try
# loading from a debug path before the regular path. This allows test
# such as 1008.5 that test loading of corrupt TAs.
-CFG_TA_TEST_PATH ?= 1
+CFG_TA_TEST_PATH ?= y
# Default output directory.
# May be absolute, or relative to the optee_client source directory.
index a1bbee36932fbf537fcb57d81c5f0fe9dc516742..05b65e8f230c672807e6ef5db3f6a7ef51b173cc 100644 (file)
--- a/tee-supplicant/Makefile
+++ b/tee-supplicant/Makefile
ifeq ($(RPMB_EMU),1)
TEES_CFLAGS += -DRPMB_EMU=1
endif
-ifeq ($(CFG_TA_TEST_PATH),1)
+ifeq ($(CFG_TA_TEST_PATH),y)
TEES_CFLAGS += -DCFG_TA_TEST_PATH=1
endif
TEES_FILE := $(OUT_DIR)/$(PACKAGE_NAME)
index 418201207bd926f0e3a329a543b65417bad314c9..dfd591949773a0be9c6c244b40c0b9a61e80c1fe 100644 (file)
#ifdef CFG_TA_TEST_PATH
# ifndef TEEC_TEST_LOAD_PATH
# ifdef __ANDROID__
-# define TEEC_TEST_LOAD_PATH "/data/tmp"
+# define TEEC_TEST_LOAD_PATH "/data/tee"
# else
# define TEEC_TEST_LOAD_PATH "/tmp"
# endif
index 1fa0eae409eb69b640d96a80555063e97eedbf15..60f7e822cf6e8a0853fa9290b76114b30a2da9d3 100644 (file)
-DBINARY_PREFIX=\"TEES\" \
-DTEEC_LOAD_PATH=\"$(CFG_TEE_CLIENT_LOAD_PATH)\" \
-ifeq ($(CFG_TA_TEST_PATH),1)
+ifeq ($(CFG_TA_TEST_PATH),y)
LOCAL_CFLAGS += -DCFG_TA_TEST_PATH=1
endif