cleanup Makefile for test. Cleanup CI stages.

This commit is contained in:
Steve Karg
2019-10-19 14:52:31 -05:00
parent 944362801f
commit d465e9409b
2 changed files with 22 additions and 17 deletions
+14 -14
View File
@@ -6,20 +6,20 @@ compiler:
jobs: jobs:
include: include:
- os: linux - stage: lint
os: linux
compiler: clang compiler: clang
script: scan-build --status-bugs -analyze-headers -v make -j2 script: scan-build --status-bugs -analyze-headers -v make -j2
- os: linux - stage: demos-build
compiler: gcc
script: make
- stage: lint
name: "Pretty Check"
os: linux os: linux
addons: compiler: gcc
apt: script: make clean all
sources: - stage: gateway-build
- llvm-toolchain-xenial-6.0 os: linux
- ubuntu-toolchain-r-test compiler: gcc
packages: script: make clean gateway
- clang-format-6.0 - stage: unit-tests
script: make pretty-check os: linux
compiler: gcc
script: make clean test
+8 -3
View File
@@ -62,7 +62,7 @@ CFLAGS = $(WARNINGS) $(DEBUGGING) $(OPTIMIZATION) $(STANDARDS) $(INCLUDES) $(DE
.EXPORT_ALL_VARIABLES: .EXPORT_ALL_VARIABLES:
all: library demos router-ipv6 ${DEMO_LINUX} all: library demos router-ipv6 ${DEMO_LINUX}
.PHONY : all library demos router gateway router-ipv6 clean .PHONY : all library demos router gateway router-ipv6 clean test
library: library:
$(MAKE) -s -C lib all $(MAKE) -s -C lib all
@@ -130,5 +130,10 @@ clean:
$(MAKE) -s -C demo/gateway clean $(MAKE) -s -C demo/gateway clean
test: test:
$(MAKE)make -s -C test clean all report $(MAKE) -s -C test clean
$(MAKE)make -s -C demo/objects clean all report $(MAKE) -s -C test all
$(MAKE) -s -C test report
$(MAKE) -s -C demo/objects clean
$(MAKE) -s -C demo/objects all
$(MAKE) -s -C demo/objects report