From 796b346d4762a93be7bfc2ba5ce97b9ab840a4bd Mon Sep 17 00:00:00 2001
From: hukoyu <hukoyu@microsoft.com>
Date: Wed, 19 Aug 2020 11:46:38 -0700
Subject: [PATCH] Skip tests for dotnet, java and ml/openvino for ethreads=1
 (#801)

---
 tests/languages/dotnet/Makefile           | 8 ++++++++
 tests/languages/java/hello_world/Makefile | 8 ++++++++
 tests/languages/java/read_file/Makefile   | 8 ++++++++
 tests/languages/java/thread/Makefile      | 8 ++++++++
 tests/ml/openvino/Makefile                | 8 ++++++++
 5 files changed, 40 insertions(+)

diff --git a/tests/languages/dotnet/Makefile b/tests/languages/dotnet/Makefile
index 1f28796e4..3d1c4f0c9 100644
--- a/tests/languages/dotnet/Makefile
+++ b/tests/languages/dotnet/Makefile
@@ -31,6 +31,14 @@ $(DISK_IMAGE):
 
 run: run-hw
 
+ifeq ($(SGXLKL_ETHREADS),1)
+skip-run-hw:
+	@echo "true"
+
+skip-run-sw:
+	@echo "true"
+endif
+
 run-hw: $(DISK_IMAGE)
 	${SGXLKL_ENV} ${SGXLKL_STARTER} --hw-debug $(DISK_IMAGE) $(ENCLAVE_CMD)
 
diff --git a/tests/languages/java/hello_world/Makefile b/tests/languages/java/hello_world/Makefile
index 5c7fe533d..e0bf478d4 100644
--- a/tests/languages/java/hello_world/Makefile
+++ b/tests/languages/java/hello_world/Makefile
@@ -21,6 +21,14 @@ $(DISK_IMAGE): $(PROG_SRC)
 
 run: run-hw run-sw
 
+ifeq ($(SGXLKL_ETHREADS),1)
+skip-run-hw:
+	@echo "true"
+
+skip-run-sw:
+	@echo "true"
+endif
+
 run-hw: $(DISK_IMAGE)
 	@echo "sgx-lkl-java --hw-debug ${DISK_IMAGE} HelloWorld"
 	@${SGXLKL_ENV} ${SGXLKL_JAVA_RUN} --hw-debug ${DISK_IMAGE} HelloWorld
diff --git a/tests/languages/java/read_file/Makefile b/tests/languages/java/read_file/Makefile
index b704c8d9d..898d3bf9d 100644
--- a/tests/languages/java/read_file/Makefile
+++ b/tests/languages/java/read_file/Makefile
@@ -22,6 +22,14 @@ $(DISK_IMAGE): $(MAINAPP_JAVA) $(FILEREADER_JAVA)
 
 run: run-hw run-sw
 
+ifeq ($(SGXLKL_ETHREADS),1)
+skip-run-hw:
+	@echo "true"
+
+skip-run-sw:
+	@echo "true"
+endif
+
 run-hw: $(DISK_IMAGE)
 	@echo "sgx-lkl-java --hw-debug ${DISK_IMAGE} ${PROG}"
 	@${SGXLKL_ENV} ${SGXLKL_JAVA_RUN} --hw-debug ${DISK_IMAGE} ${PROG}
diff --git a/tests/languages/java/thread/Makefile b/tests/languages/java/thread/Makefile
index 4222ea6d7..d42a112dc 100644
--- a/tests/languages/java/thread/Makefile
+++ b/tests/languages/java/thread/Makefile
@@ -20,6 +20,14 @@ $(DISK_IMAGE): app/SharedData.java app/SimpleThread.java app/MainApp.java
 
 run: run-hw run-sw
 
+ifeq ($(SGXLKL_ETHREADS),1)
+skip-run-hw:
+	@echo "true"
+
+skip-run-sw:
+	@echo "true"
+endif
+
 run-hw: $(DISK_IMAGE)
 	@echo "sgx-lkl-java --hw-debug ${DISK_IMAGE} ${PROG}"
 	@${SGXLKL_ENV} ${SGXLKL_JAVA_RUN} --hw-debug ${DISK_IMAGE} ${PROG}
diff --git a/tests/ml/openvino/Makefile b/tests/ml/openvino/Makefile
index d2e4cdcc9..1fe0ff06b 100644
--- a/tests/ml/openvino/Makefile
+++ b/tests/ml/openvino/Makefile
@@ -34,6 +34,14 @@ $(DISK_IMAGE): Dockerfile
 
 run: run-hw
 
+ifeq ($(SGXLKL_ETHREADS),1)
+skip-run-hw:
+	@echo "true"
+
+skip-run-sw:
+	@echo "true"
+endif
+
 run-hw: $(DISK_IMAGE)
 	${SGXLKL_ENV} ${SGXLKL_STARTER} --hw-debug $(DISK_IMAGE) $(ENCLAVE_CMD)