Browse Source

[Makefile] Move building of tests to a separate target

Fixes #204.
Simon Gaiser 4 years ago
parent
commit
1ff85d10a3

+ 1 - 0
Jenkinsfiles/Linux

@@ -7,6 +7,7 @@ pipeline {
                     steps {
                         sh '''
                             make -j 8 WERROR=1
+                            make -j 8 WERROR=1 test
                             cd Pal/ipc/linux
                             make
                            '''

+ 1 - 0
Jenkinsfiles/Linux-18.04

@@ -7,6 +7,7 @@ pipeline {
                     steps {
                         sh '''
                             make -j 8 WERROR=1
+                            make -j 8 WERROR=1 test
                             # We can't build this on 18.04 in our current pipeline
                             #cd Pal/ipc/linux
                             #make

+ 1 - 0
Jenkinsfiles/Linux-Debug

@@ -7,6 +7,7 @@ pipeline {
                     steps {
                         sh '''
                             make -j 8 DEBUG=1 WERROR=1
+                            make -j 8 DEBUG=1 WERROR=1 test
                            '''
                     }
                 }

+ 1 - 0
Jenkinsfiles/Linux-Debug-18.04

@@ -7,6 +7,7 @@ pipeline {
                     steps {
                         sh '''
                             make -j 8 DEBUG=1 WERROR=1
+                            make -j 8 DEBUG=1 WERROR=1 test
                            '''
                     }
                 }

+ 2 - 1
Jenkinsfiles/Linux-SGX

@@ -24,9 +24,10 @@ pipeline {
                         '''
                         sh '''
                             make -j 8 SGX=1 WERROR=1
+                            make -j 8 SGX=1 WERROR=1 test
                         '''
                         sh '''
-                            make SGX_RUN=1
+                            make SGX_RUN=1 test
                         '''
                     }
                 }

+ 2 - 1
Jenkinsfiles/Linux-SGX-18.04

@@ -24,9 +24,10 @@ pipeline {
                         '''
                         sh '''
                             make -j 8 SGX=1 WERROR=1
+                            make -j 8 SGX=1 WERROR=1 test
                         '''
                         sh '''
-                            make SGX_RUN=1
+                            make SGX_RUN=1 test
                         '''
                     }
                 }

+ 4 - 0
LibOS/Makefile

@@ -116,3 +116,7 @@ $(GLIBC_TARGET):
 clean:
 	rm -rf $(BUILD_DIR)
 endif
+
+.PHONY: test
+test:
+	$(MAKE) -C $(SHIM_DIR) test

+ 11 - 5
LibOS/shim/Makefile

@@ -3,12 +3,18 @@ MAKEFLAGS += --check-symlink-times
 SYS ?= $(shell gcc -dumpmachine)
 export SYS
 
-targets = all clean
+.PHONY: all
+all:
+	make -C src
 
-.PHONY: $(targets)
-$(targets):
-	make $@ -C src
-	make $@ -C test
+.PHONY: test
+test:
+	make -C test
+
+.PHONY: clean
+clean:
+	make -C src clean
+	make -C test clean
 
 .PHONY: format
 format:

+ 1 - 1
Makefile

@@ -1,7 +1,7 @@
 SYS ?= $(shell gcc -dumpmachine)
 export SYS
 
-targets = all clean format
+targets = all clean format test
 
 .PHONY: $(targets)
 $(targets):

+ 12 - 7
Pal/Makefile

@@ -2,16 +2,21 @@ include src/Makefile.Host
 
 DIRS = src test regression
 
-.PHONY: all clean
-all clean:
-	for d in $(DIRS); \
-	do \
-		$(MAKE) -C $$d $@ || exit $?; \
-	done
+.PHONY: all
+all:
+	$(MAKE) -C src
+
+.PHONY: clean
+clean:
+	$(MAKE) -C src clean
+	$(MAKE) -C test clean
+	$(MAKE) -C regression clean
 
 .PHONY: test
 test:
-	$(MAKE) -C test test
+	$(MAKE) -C src test
+	$(MAKE) -C test
+	$(MAKE) -C regression
 
 .PHONY: format
 format:

+ 4 - 0
Pal/src/Makefile

@@ -144,3 +144,7 @@ $(OBJ_DIR)/%.s: %.c $(headers)
 clean:
 	rm -rf $(LIB_DIR) $(OBJ_DIR) $(files_to_build)
 	@[ ! -d $(HOST_DIR) ] || $(MAKE) -C $(HOST_DIR) clean
+
+.PHONY: test
+test:
+	$(MAKE) -C $(HOST_DIR) test

+ 3 - 0
Pal/src/host/Linux-SGX/Makefile

@@ -93,3 +93,6 @@ CLEAN_FILES += debugger/sgx_gdb.o
 .PHONY: clean
 clean:
 	rm -f *.o *.e *.i *.s $(host_files) $(CLEAN_FILES)
+
+.PHONY: test
+test:

+ 3 - 0
Pal/src/host/Linux/Makefile

@@ -55,3 +55,6 @@ CLEAN_FILES += $(notdir $(pal_static) $(pal_lib) $(pal_loader))
 .PHONY: clean
 clean:
 	rm -f $(addsuffix .o,$(objs)) $(host_files) $(CLEAN_FILES)
+
+.PHONY: test
+test:

+ 3 - 0
Runtime/Makefile

@@ -7,3 +7,6 @@ clean:
 
 .PHONY: format
 format:
+
+.PHONY: test
+test: