#17 fix tests not running

pull/32/head
Geoffrey Merck 4 years ago
parent 17d0dc0d5a
commit c23134009e

@ -24,7 +24,7 @@ jobs:
command: "make -j 3 ENABLE_DEBUG=1 USE_GPSD=1" command: "make -j 3 ENABLE_DEBUG=1 USE_GPSD=1"
- run: - run:
name: "Run Tests" name: "Run Tests"
command: "make run-tests" command: "make run-tests ENABLE_DEBUG=1 USE_GPSD=1"
# Invoke jobs via workflows # Invoke jobs via workflows
# See: https://circleci.com/docs/2.0/configuration-reference/#workflows # See: https://circleci.com/docs/2.0/configuration-reference/#workflows
workflows: workflows:

25
.vscode/tasks.json vendored

@ -4,7 +4,7 @@
"version": "2.0.0", "version": "2.0.0",
"tasks": [ "tasks": [
{ {
"label": "Build", "label": "Build All",
"type": "shell", "type": "shell",
"command": "make", "command": "make",
"args": [ "args": [
@ -12,10 +12,20 @@
"ENABLE_DEBUG=1", "ENABLE_DEBUG=1",
"USE_GPSD=1" "USE_GPSD=1"
], ],
"group": { "group": "build",
"kind": "build", "problemMatcher": []
"isDefault": true },
}, {
"label": "Build DStarGateway",
"type": "shell",
"command": "make",
"args": [
"-j3",
"ENABLE_DEBUG=1",
"USE_GPSD=1",
"DStarGateway/dstargateway"
],
"group": "build",
"problemMatcher": [] "problemMatcher": []
}, },
{ {
@ -28,7 +38,10 @@
"ENABLE_DEBUG=1", "ENABLE_DEBUG=1",
"USE_GPSD=1" "USE_GPSD=1"
], ],
"group": "build", "group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": [] "problemMatcher": []
} }
] ]

@ -145,3 +145,4 @@ run-tests: tests
@$(MAKE) -C Tests run-tests @$(MAKE) -C Tests run-tests
FORCE: FORCE:
@true

@ -1,5 +1,4 @@
SRCS = $(wildcard *.cpp) $(wildcard */*.cpp)
SRCS = $(wildcard *.cpp) $(wildcard ../*.cpp) $(wildcard */*.cpp)
OBJS = $(SRCS:.cpp=.o) OBJS = $(SRCS:.cpp=.o)
DEPS = $(SRCS:.cpp=.d) DEPS = $(SRCS:.cpp=.d)

Loading…
Cancel
Save

Powered by TurnKey Linux.