commit 6ef2e977baa7a958cb212e4adc1bf3279e611580
author Jerome Forissier <jerome.forissier@linaro.org> Fri Jan 22 17:51:13 2016 +0100
committer Jerome Forissier <jerome.forissier@linaro.org> Mon Feb 01 18:23:36 2016 +0100
tree 1ff9f69dd3822e681db602c5fd11d6a2006a38c3
parent 6a9d15a647aefa62bb0aab7a4a35d32746d044eb

Disable xtest 20000 (FS corruption tests) when OP-TEE uses RPMB

When the filesystem is implemented over RPMB (CFG_RPMB_FS=y), there is
not point trying to corrupt files in the REE.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>

Android.mk

diff --git a/Android.mk b/Android.mk
index 33d03e5..b8c6bba 100644
--- a/Android.mk
+++ b/Android.mk
@@ -57,6 +57,9 @@
 ifeq ($(CFG_ENC_FS),y)
 LOCAL_CFLAGS += -DCFG_ENC_FS
 endif
+ifeq ($(CFG_RPMB_FS),y)
+LOCAL_CFLAGS += -DCFG_RPMB_FS
+endif
 
 LOCAL_CFLAGS += -DUSER_SPACE
 LOCAL_CFLAGS += -DTA_DIR=\"/system/lib/optee_armtz\"

host/xtest/Makefile

diff --git a/host/xtest/Makefile b/host/xtest/Makefile
index f695aa3..da3f46f 100644
--- a/host/xtest/Makefile
+++ b/host/xtest/Makefile
@@ -107,6 +107,9 @@
 ifeq ($(CFG_ENC_FS),y)
 CFLAGS += -DCFG_ENC_FS
 endif
+ifeq ($(CFG_RPMB_FS),y)
+CFLAGS += -DCFG_RPMB_FS
+endif
 
 ifndef CFG_GP_PACKAGE_PATH
 CFLAGS += -Wall -Wcast-align -Werror \

host/xtest/xtest_20000.c

diff --git a/host/xtest/xtest_20000.c b/host/xtest/xtest_20000.c
index 3850065..ef7cb6d 100644
--- a/host/xtest/xtest_20000.c
+++ b/host/xtest/xtest_20000.c
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-#ifdef CFG_ENC_FS
+#if defined(CFG_ENC_FS) && !defined(CFG_RPMB_FS)
 
 #include <stdlib.h>
 #include <string.h>
@@ -858,4 +858,4 @@
 	"Description of how to implement ..."
 	);
 
-#endif /* CFG_ENC_FS */
+#endif /* defined(CFG_ENC_FS) && !defined(CFG_RPMB_FS) */

host/xtest/xtest_main.c

diff --git a/host/xtest/xtest_main.c b/host/xtest/xtest_main.c
index d73f4b1..3e9fe2a 100644
--- a/host/xtest/xtest_main.c
+++ b/host/xtest/xtest_main.c
@@ -85,7 +85,7 @@
 #endif /*USER_SPACE*/
 ADBG_SUITE_ENTRY(XTEST_TEE_10001, NULL)
 ADBG_SUITE_ENTRY(XTEST_TEE_10002, NULL)
-#ifdef CFG_ENC_FS
+#if defined(CFG_ENC_FS) && !defined(CFG_RPMB_FS)
 ADBG_SUITE_ENTRY(XTEST_TEE_20001, NULL)
 ADBG_SUITE_ENTRY(XTEST_TEE_20002, NULL)
 ADBG_SUITE_ENTRY(XTEST_TEE_20003, NULL)
@@ -100,7 +100,7 @@
 ADBG_SUITE_ENTRY(XTEST_TEE_20521, NULL)
 ADBG_SUITE_ENTRY(XTEST_TEE_20522, NULL)
 ADBG_SUITE_ENTRY(XTEST_TEE_20523, NULL)
-#endif /* CFG_ENC_FS */
+#endif /* defined(CFG_ENC_FS) && !defined(CFG_RPMB_FS) */
 
 ADBG_SUITE_DEFINE_END()
 

host/xtest/xtest_test.h

diff --git a/host/xtest/xtest_test.h b/host/xtest/xtest_test.h
index 39f43b3..3e53022 100644
--- a/host/xtest/xtest_test.h
+++ b/host/xtest/xtest_test.h
@@ -77,7 +77,7 @@
 ADBG_CASE_DECLARE(XTEST_TEE_10001);
 ADBG_CASE_DECLARE(XTEST_TEE_10002);
 
-#ifdef CFG_ENC_FS
+#if defined(CFG_ENC_FS) && !defined(CFG_RPMB_FS)
 ADBG_CASE_DECLARE(XTEST_TEE_20001);
 ADBG_CASE_DECLARE(XTEST_TEE_20002);
 ADBG_CASE_DECLARE(XTEST_TEE_20003);
@@ -92,7 +92,7 @@
 ADBG_CASE_DECLARE(XTEST_TEE_20521);
 ADBG_CASE_DECLARE(XTEST_TEE_20522);
 ADBG_CASE_DECLARE(XTEST_TEE_20523);
-#endif /* CFG_ENC_FS */
+#endif /* defined(CFG_ENC_FS) && !defined(CFG_ENC_FS) */
 
 ADBG_CASE_DECLARE(XTEST_TEE_BENCHMARK_1001);
 ADBG_CASE_DECLARE(XTEST_TEE_BENCHMARK_1002);