general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add counters for passes and failures in test

Browse Source 
Also exit with error if the fail number is not 0.
This commit is contained in:
Hui, Chunyang 2020-04-08 08:20:54 +00:00 committed by tate.thl
parent dadffb9f17
commit bc6002f6dd
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/Makefile
View File

@ -8,6 +8,9 @@ else
BUILD_DIR := $(PROJECT_DIR)/build BUILD_DIR := $(PROJECT_DIR)/build
endif endif
PASS_LOG = $(BUILD_DIR)/test/.pass
FAIL_LOG = $(BUILD_DIR)/test/.fail
# Dependencies: need to be compiled but not to run by any Makefile target # Dependencies: need to be compiled but not to run by any Makefile target
TEST_DEPS := client data_sink TEST_DEPS := client data_sink
# Tests: need to be compiled and run by test-% target # Tests: need to be compiled and run by test-% target
@ -63,18 +66,23 @@ postbuild:
############################################################################# #############################################################################
test: build pretest $(TEST_TARGETS) posttest test: build pretest $(TEST_TARGETS) posttest
pretest: pretest:
@$(RM) $(PASS_LOG) $(FAIL_LOG)
@cd $(BUILD_DIR)/test && \ @cd $(BUILD_DIR)/test && \
$(BUILD_DIR)/bin/occlum start $(BUILD_DIR)/bin/occlum start
$(TEST_TARGETS): test-%: % $(TEST_TARGETS): test-%: %
@touch $(PASS_LOG) $(FAIL_LOG)
@$(ECHO) "$(CYAN)RUN TEST => $<$(NO_COLOR)" @$(ECHO) "$(CYAN)RUN TEST => $<$(NO_COLOR)"
@# Restart server if test failed @# Restart server if test failed
@$(MAKE) --no-print-directory -C $< test ; \ @$(MAKE) --no-print-directory -C $< test ; \
if [ $$? -eq 0 ] ; then \ if [ $$? -eq 0 ] ; then \
$(ECHO) "$(GREEN)PASS$(NO_COLOR)" ; \ $(ECHO) "$(GREEN)PASS$(NO_COLOR)" ; \
$(ECHO) "$< PASS" >> $(PASS_LOG) ; \
else \ else \
$(ECHO) "$(RED)FAILED$(NO_COLOR)" ; \ $(ECHO) "$(RED)FAILED$(NO_COLOR)" ; \
$(ECHO) "$< FAILED" >> $(FAIL_LOG) ; \
cd $(BUILD_DIR)/test && \ cd $(BUILD_DIR)/test && \
$(BUILD_DIR)/bin/occlum start ; \ $(BUILD_DIR)/bin/occlum start ; \
fi ; fi ;
@ -82,6 +90,13 @@ $(TEST_TARGETS): test-%: %
posttest: posttest:
@cd $(BUILD_DIR)/test && \ @cd $(BUILD_DIR)/test && \
$(BUILD_DIR)/bin/occlum stop $(BUILD_DIR)/bin/occlum stop
@PASS_NUM=$(shell wc -l < $(PASS_LOG)); \
FAIL_NUM=$(shell wc -l < $(FAIL_LOG)); \
$(ECHO) "\nTotal:" ; \
$(ECHO) "$(GREEN)PASS: $$PASS_NUM $(RED)FAILED: $$FAIL_NUM $(NO_COLOR)" ; \
if [ $$FAIL_NUM -ne 0 ] ; then \
exit 1; \
fi ;
############################################################################# #############################################################################
# Benchmark targets # Benchmark targets