Skip tests for dotnet, java and ml/openvino for ethreads=1 (#801)

lsds · Aug 19, 2020 · 796b346 · 796b346
1 parent 7716e93
commit 796b346
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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)