From 6f52d8a4e311ef5f83fa500e7ba444da2dc1c2e4 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Mon, 9 Oct 2017 02:38:57 -0400 Subject: [PATCH] Makefile fix scan-build path (#8091) --- Makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 2a431f73a4..25cf4c50e0 100644 --- a/Makefile +++ b/Makefile @@ -293,7 +293,7 @@ format: # Testing # -------------------------------------------------------------------- -.PHONY: tests tests_coverage coveralls_upload codecov_upload +.PHONY: tests tests_coverage tests: $(MAKE) --no-print-directory posix_sitl_default test_results @@ -301,14 +301,6 @@ tests: tests_coverage: @$(MAKE) --no-print-directory posix_sitl_default test_coverage_genhtml PX4_CMAKE_BUILD_TYPE=Coverage -coveralls_upload: - @cpp-coveralls --include src/ \ - --exclude=src/lib/DriverFramework \ - --exclude=src/lib/ecl \ - --exclude=src/lib/Matrix \ - --exclude=src/modules/uavcan/libuavcan \ - --root . --build-root build/posix_sitl_default/ --follow-symlinks - # static analyzers (scan-build, clang-tidy, cppcheck) # -------------------------------------------------------------------- .PHONY: posix_sitl_default-clang scan-build clang-tidy clang-tidy-fix clang-tidy-quiet cppcheck check_stack @@ -322,7 +314,7 @@ scan-build: @export CCC_CC=clang @export CCC_CXX=clang++ @mkdir -p $(SRC_DIR)/build/posix_sitl_default-scan-build - @cd $(SRC_DIR)/build/posix_sitl_default-scan-build && scan-build cmake .. -GNinja -DCONFIG=posix_sitl_default + @cd $(SRC_DIR)/build/posix_sitl_default-scan-build && scan-build cmake $(SRC_DIR) -GNinja -DCONFIG=posix_sitl_default @scan-build -o $(SRC_DIR)/build/scan-build cmake --build $(SRC_DIR)/build/posix_sitl_default-scan-build clang-tidy: posix_sitl_default-clang