Merge pull request #56 from acooks/gh-ci-actions-churn

Add/Fix code climate code coverage

.github/workflows/main.yml

@@ -29,15 +29,15 @@ jobs:
           sudo apt-get update
           sudo apt-get install libnl-3-dev libnl-route-3-dev libnl-genl-3-dev libjansson-dev libwebsockets-dev libncurses5-dev libpcap-dev pkgconf lcov
     - name: make
-      run: CFLAGS="-fprofile-arcs -ftest-coverage" make
+      run: make
 
     - name: Run tests
-      run: sudo CFLAGS="-fprofile-arcs -ftest-coverage" make test
+      run: sudo make test
 
     - name: Upload coverage to Code Climate      
       uses: paambaati/[email protected]
       env:
         CC_TEST_REPORTER_ID: ${{ secrets.CODECLIMATE_REPORTER_ID }}
       with:
-        coverageCommand: lcov -c -d server -d cli-client -d messages/ -o jittertrap.lcov
+        coverageCommand: make coverage
         coverageLocations: ${{github.workspace}}/*.lcov:lcov

Makefile

@@ -46,6 +46,11 @@ cppcheck:
 clang-analyze:
 	scan-build make messages server cli-client
 
+coverage:
+	CFLAGS="-fprofile-arcs -ftest-coverage" $(MAKE) clean test
+	lcov -c --no-external -d server -d cli-client -d messages -o jittertrap.lcov
+
+
 .PHONY: clean $(CLEANDIRS)
 clean: $(CLEANDIRS)
 $(CLEANDIRS):

cli-client/Makefile

@@ -49,6 +49,8 @@ indent:
 .PHONY: clean
 clean:
 	rm $(PROG) || true
+	rm *.gcno *.gcov *.gcda || true
+
 
 .PHONY: test
 test:

deps/toptalk/Makefile

@@ -79,3 +79,4 @@ clang-analyze: clean
 .PHONY: clean
 clean:
 	rm $(LIB) $(PROG) $(TEST) *.o *.a || true
+	rm *.gcno *.gcov *.gcda || true

messages/Makefile

@@ -80,3 +80,4 @@ test: test-packing
 .PHONY: clean
 clean:
 	rm $(LIB) *.o *.a test-packing || true
+	rm *.gcno *.gcov *.gcda || true

server/Makefile

@@ -162,3 +162,4 @@ test-toptalk: $(TOPTALK_LIB) $(TOPTALK_TEST_SOURCES)
 clean:
 	rm $(PROG) *.o || true
 	rm test-mq test-mq-mt test-multi-mq || true
+	rm *.gcno *.gcov *.gcda || true