xtest: gate the GP socket tests at compile time

Android.mk

@@ -28,15 +28,7 @@ LOCAL_SHARED_LIBRARIES := libteec
 
 TA_DIR ?= /vendor/lib/optee_armtz
 
-srcs := regression_1000.c
-
-ifeq ($(CFG_GP_SOCKETS),y)
-srcs += regression_2000.c \
-	sock_server.c \
-	rand_stream.c
-endif
-
-srcs +=	adbg/src/adbg_case.c \
+srcs :=	adbg/src/adbg_case.c \
 	adbg/src/adbg_enum.c \
 	adbg/src/adbg_expect.c \
 	adbg/src/adbg_log.c \
@@ -46,6 +38,8 @@ srcs +=	adbg/src/adbg_case.c \
 	benchmark_1000.c \
 	benchmark_2000.c \
 	clear_storage.c \
+	regression_1000.c \
+	regression_2000.c \
 	regression_4000.c \
 	regression_4100.c \
 	regression_5000.c \
@@ -54,6 +48,8 @@ srcs +=	adbg/src/adbg_case.c \
 	regression_8100.c \
 	hash_perf.c \
 	install_ta.c \
+	rand_stream.c \
+	sock_server.c \
 	stats.c \
 	symm_cipher_perf.c \
 	xtest_helpers.c \

host/xtest/CMakeLists.txt

@@ -50,6 +50,7 @@ set (SRC
 	benchmark_2000.c
 	clear_storage.c
 	regression_1000.c
+	regression_2000.c
 	regression_4000.c
 	regression_4100.c
 	regression_5000.c
@@ -58,6 +59,8 @@ set (SRC
 	regression_8100.c
 	hash_perf.c
 	install_ta.c
+	rand_stream.c
+	sock_server.c
 	stats.c
 	symm_cipher_perf.c
 	xtest_helpers.c
@@ -94,14 +97,6 @@ if (WITH_GP_TESTS)
 	set (GP_INCLUDES PRIVATE gp/include)
 endif()
 
-if (CFG_GP_SOCKETS)
-	list (APPEND SRC
-		regression_2000.c
-		sock_server.c
-		rand_stream.c
-	)
-endif()
-
 if (CFG_SECURE_DATA_PATH)
 	list (APPEND SRC sdp_basic.c)
 endif()

host/xtest/Makefile

@@ -47,15 +47,7 @@ endif
 LDFLAGS += -lcrypto
 endif #require OpenSSL
 
-srcs := regression_1000.c
-
-ifeq ($(CFG_GP_SOCKETS),y)
-srcs += regression_2000.c \
-	sock_server.c \
-	rand_stream.c
-endif
-
-srcs +=	adbg/src/adbg_case.c \
+srcs :=	adbg/src/adbg_case.c \
 	adbg/src/adbg_enum.c \
 	adbg/src/adbg_expect.c \
 	adbg/src/adbg_log.c \
@@ -65,6 +57,8 @@ srcs +=	adbg/src/adbg_case.c \
 	benchmark_1000.c \
 	benchmark_2000.c \
 	clear_storage.c \
+	regression_1000.c \
+	regression_2000.c \
 	regression_4000.c \
 	regression_4100.c \
 	regression_5000.c \
@@ -73,6 +67,8 @@ srcs +=	adbg/src/adbg_case.c \
 	regression_8100.c \
 	hash_perf.c \
 	install_ta.c \
+	rand_stream.c \
+	sock_server.c \
 	stats.c \
 	symm_cipher_perf.c \
 	xtest_helpers.c \

host/xtest/rand_stream.c

@@ -3,6 +3,8 @@
  * Copyright (c) 2016, Linaro Limited
  */
 
+#ifdef CFG_GP_SOCKETS
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -115,3 +117,5 @@ void rand_stream_advance(struct rand_stream *rs, size_t num_bytes)
 	get_random(rs, rs->stream_buf, rs->sb_size);
 	rs->sb_offs = nb;
 }
+
+#endif /* CFG_GP_SOCKETS */

host/xtest/regression_2000.c

@@ -3,6 +3,8 @@
  * Copyright (c) 2016, Linaro Limited
  */
 
+#ifdef CFG_GP_SOCKETS
+
 #include <assert.h>
 #include <err.h>
 #include <pthread.h>
@@ -927,3 +929,5 @@ static void xtest_tee_test_2004(ADBG_Case_t *c)
 }
 ADBG_CASE_DEFINE(regression, 2004, xtest_tee_test_2004,
 		"UDP iSocket API tests");
+
+#endif /* CFG_GP_SOCKETS */

host/xtest/sock_server.c

@@ -3,6 +3,8 @@
  * Copyright (c) 2016, Linaro Limited
  */
 
+#ifdef CFG_GP_SOCKETS
+
 #include <sys/types.h>
 #include <stdbool.h>
 #include <arpa/inet.h>
@@ -394,3 +396,5 @@ void sock_server_unlock(struct sock_server *ts)
 		errx(1, "sock_server_unlock: pthread_mutex_unlock: %s",
 		     strerror(e));
 }
+
+#endif /* CFG_GP_SOCKETS */