Use gcovr for code coverage

onox · onox · commit 23d77ebf7641 · 2024-07-28T16:57:06.000+02:00
diff --git a/Makefile b/Makefile
@@ -1,25 +1,24 @@
+ALR_CLEAN = alr clean -- -p
+ALR_BUILD = alr build --development --profiles="*=development"
+
 .PHONY: build clean prove tests coverage
 
 build:
-	cd json && alr build --validation
+	cd json && $(ALR_BUILD)
 
 clean:
 	-gnatprove --clean -P json/json.gpr
-	cd json && alr clean
-	cd tests && alr clean
-	rm -rf json/build tests/build tests/build/cov tests/TEST-*.xml
+	cd json && $(ALR_CLEAN)
+	cd tests && $(ALR_CLEAN)
+	rm -rf json/build tests/build tests/TEST-*.xml
 
 prove:
 	gnatprove -P json/json.gpr
 
 tests:
-	cd tests && alr build --development
+	cd tests && ADAFLAGS="--coverage -gnata" $(ALR_BUILD)
 	cd tests && alr run -s
 
 coverage:
 	mkdir -p tests/build/cov
-	lcov -q -c -d json/build/obj -d tests/build/obj -o tests/build/cov/unit.info
-	lcov -q -r tests/build/cov/unit.info */adainclude/* -o tests/build/cov/unit.info
-	lcov -q -r tests/build/cov/unit.info */tests/* -o tests/build/cov/unit.info
-	genhtml -q --ignore-errors source -o tests/build/cov/html tests/build/cov/unit.info
-	lcov -l tests/build/cov/unit.info
+	gcovr --exclude test --html-nested tests/build/cov/coverage.html
diff --git a/json/alire.toml b/json/alire.toml
@@ -5,14 +5,15 @@ website = "https://github.com/onox/json-ada"
 licenses = "Apache-2.0"
 tags = ["json"]
 
-executables = ["pretty_print"]
+#executables = ["pretty_print"]
+#project-files = ["json.gpr", "json_pretty_print.gpr"]
 
-project-files = ["json.gpr", "json_pretty_print.gpr"]
+project-files = ["json.gpr"]
 
 authors = ["onox"]
 maintainers = ["onox <denkpadje@gmail.com>"]
 maintainers-logins = ["onox"]
 
 [build-switches]
 validation.compile_checks = "warnings"
-"*".style_checks = ["-gnatygAO-Is"]
+"*".style_checks = ["-gnatygAOM120-Is"]
diff --git a/json/json.gpr b/json/json.gpr
@@ -17,7 +17,7 @@ project JSON is
    for Library_Kind use Library_Type;
 
    package Compiler is
-      for Default_Switches ("Ada") use Json_Config.Ada_Compiler_Switches & ("-gnatyM99");
+      for Default_Switches ("Ada") use Json_Config.Ada_Compiler_Switches;
       for Local_Configuration_Pragmas use "gnat.adc";
    end Compiler;
 
diff --git a/tests/alire.toml b/tests/alire.toml
@@ -20,4 +20,4 @@ json = { path = "../json" }
 
 [build-switches]
 validation.compile_checks = "warnings"
-"*".style_checks = ["-gnatygAO-Is"]
+"*".style_checks = ["-gnatygAOM120-Is"]
diff --git a/tests/json_tests.gpr b/tests/json_tests.gpr
@@ -30,8 +30,7 @@ project JSON_Tests is
    for Main use ("test_bindings.adb");
 
    package Compiler is
-      for Default_Switches ("Ada") use Json_Tests_Config.Ada_Compiler_Switches &
-        ("-gnatyM99", "--coverage");
+      for Default_Switches ("Ada") use Json_Tests_Config.Ada_Compiler_Switches;
       for Local_Configuration_Pragmas use "gnat.adc";
    end Compiler;
 
@@ -40,7 +39,7 @@ project JSON_Tests is
    end Binder;
 
    package Linker is
-      for Switches ("Ada") use ("-lgcov");
+      for Switches ("Ada") use ("--coverage");
    end Linker;
 
 end JSON_Tests;
