From 1abc4d93b8da1f17d1b1f121da71dfda9e6313a3 Mon Sep 17 00:00:00 2001 From: Steve Karg Date: Sat, 19 Oct 2019 15:27:12 -0500 Subject: [PATCH] Fix make test. Undo CI change for parallel. --- .travis.yml | 33 +++++++++++++++++---------------- Makefile | 6 +++--- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index a980d079..8aa7963c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,20 @@ language: c jobs: - - stage: demos-build - os: linux - compiler: gcc - script: make clean all - - stage: gateway-build - os: linux - compiler: gcc - script: make clean gateway - - stage: unit-tests - os: linux - compiler: gcc - script: make clean test - - stage: lint - os: linux - compiler: clang - script: scan-build --status-bugs -analyze-headers -v make -j2 clean server + - include: + - stage: demos-build + os: linux + compiler: gcc + script: make clean all + - stage: gateway-build + os: linux + compiler: gcc + script: make clean gateway + - stage: unit-tests + os: linux + compiler: gcc + script: make clean test + - stage: lint + os: linux + compiler: clang + script: scan-build --status-bugs -analyze-headers -v make -j2 clean server diff --git a/Makefile b/Makefile index 55e0188c..6df22b52 100644 --- a/Makefile +++ b/Makefile @@ -133,7 +133,7 @@ test: $(MAKE) -s -C test clean $(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 + $(MAKE) -s -C demo/object clean + $(MAKE) -s -C demo/object all + $(MAKE) -s -C demo/object report