chore: require explicitly building for coverage

php-ecma-intl · Sep 11, 2023 · 5f4c7b7 · 5f4c7b7
1 parent eff8e9b
commit 5f4c7b7
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 5 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -74,7 +74,7 @@ jobs:
       - name: "Build and install ecma_intl"
         run: |
           phpize
-          ./configure --enable-ecma_intl --enable-criterion
+          ./configure --enable-ecma_intl --enable-criterion --enable-code-coverage
           make -j$(nproc)
           php -d extension="$PWD/modules/ecma_intl.so" --ri ecma_intl
 

diff --git a/Makefile.frag b/Makefile.frag
@@ -7,7 +7,7 @@ check-criterion:
 	fi
 
 tests/criterion/runner: check-criterion $(criterion_objects)
-	$(CXX) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -fprofile-arcs -ftest-coverage -O0 $(LDFLAGS) $(EXTRA_LDFLAGS) $(criterion_objects) -o tests/criterion/runner $(ECMA_INTL_SHARED_LIBADD) $(CRITERION_LIBS)
+	$(CXX) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(COVERAGE_FLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(criterion_objects) -o tests/criterion/runner $(ECMA_INTL_SHARED_LIBADD) $(CRITERION_LIBS)
 
 #
 # In CLion, set the "Build target" to "dev" in the Makefile project settings,

diff --git a/composer.json b/composer.json
@@ -86,8 +86,9 @@
                 "test:coverage:html": {
                     "override": true,
                     "script": [
+                        "git clean -fX ./build/coverage/.",
                         "@dev:test:criterion",
-                        "gcovr --exclude-directories tests --html-nested --html-syntax-highlighting -o build/coverage/coverage.html"
+                        "gcovr --exclude-directories tests --html-nested --html-syntax-highlighting -o build/coverage/index.html"
                     ]
                 }
             },
@@ -102,13 +103,26 @@
             "./configure --enable-ecma_intl --enable-criterion",
             "make -j$(nproc) dev"
         ],
+        "dev:build:coverage": [
+            "make clean || true",
+            "phpize",
+            "./configure --enable-ecma_intl --enable-criterion --enable-code-coverage",
+            "make -j$(nproc) dev"
+        ],
         "dev:build:local": [
             "./tools/tool-check",
             "make clean || true",
             "./tools/phpize",
             "PKG_CONFIG_PATH=$(brew --prefix icu4c)/lib/pkgconfig ./configure --enable-ecma_intl --enable-criterion --with-php-config=tools/php-config",
             "make -j$(nproc) dev"
         ],
+        "dev:build:local:coverage": [
+            "./tools/tool-check",
+            "make clean || true",
+            "./tools/phpize",
+            "PKG_CONFIG_PATH=$(brew --prefix icu4c)/lib/pkgconfig ./configure --enable-ecma_intl --enable-criterion --enable-code-coverage --with-php-config=tools/php-config",
+            "make -j$(nproc) dev"
+        ],
         "dev:docker:run": [
             "Composer\\Config::disableProcessTimeout",
             "docker compose up -d --build",

diff --git a/config.m4 b/config.m4
@@ -21,6 +21,17 @@ PHP_ARG_ENABLE(
   [no]
 )
 
+PHP_ARG_ENABLE(
+  [code-coverage],
+  [whether to enable support for code coverage symbols],
+  [AS_HELP_STRING(
+    [--enable-code-coverage],
+    [Enable support for code coverage reports (development only)])
+  ],
+  [no],
+  [no]
+)
+
 if test "$PHP_ECMA_INTL" != "no"; then
   PKG_CHECK_MODULES([ICU], [icu-uc >= 70.1 icu-i18n icu-io])
 
@@ -166,4 +177,11 @@ if test "$PHP_ECMA_INTL" != "no"; then
 
     PHP_SUBST(criterion_objects)
   fi
+
+  if test "$PHP_CODE_COVERAGE" != "no"; then
+    AC_DEFINE(HAVE_CODE_COVERAGE, 1, [ Have code coverage support ])
+    COVERAGE_FLAGS="-fprofile-arcs -ftest-coverage -O0"
+  fi
+
+  PHP_SUBST(COVERAGE_FLAGS)
 fi
diff --git a/m4/tests.m4 b/m4/tests.m4
@@ -5,10 +5,10 @@ dnl Adapted from PHP_BUILD_PROGRAM in php.m4.
 dnl
 AC_DEFUN([TEST_BUILD_PROGRAM],[
   test_c_pre='$(CC)'
-  test_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -fprofile-arcs -ftest-coverage -O0'
+  test_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(COVERAGE_FLAGS)'
   test_c_post=
   test_cxx_pre='$(CXX)'
-  test_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) -fprofile-arcs -ftest-coverage -O0'
+  test_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) $(COVERAGE_FLAGS)'
   test_cxx_post=
 ])