Run valgrind in more environments

jbboehr · Apr 5, 2024 · 6ff37cb · 6ff37cb
1 parent 4f9ebc6
commit 6ff37cb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,6 +58,7 @@ jobs:
                 env:
                     NO_INTERACTION: 1
                     REPORT_EXIT_STATUS: 1
+                    USE_ZEND_ALLOC: 0
 
             -   run: cat tests/*.log
                 if: failure()

diff --git a/nix/derivation.nix b/nix/derivation.nix
@@ -5,11 +5,13 @@
   libcap,
   libpfm,
   pkg-config,
+  valgrind,
   autoreconfHook,
   buildPecl,
   src,
   checkSupport ? false,
-  WerrorSupport ? false,
+  WerrorSupport ? checkSupport,
+  valgrindSupport ? true,
 }:
 buildPecl rec {
   pname = "perfidious";
@@ -19,7 +21,9 @@ buildPecl rec {
   inherit src;
 
   buildInputs = [libcap libpfm];
-  nativeBuildInputs = [php.unwrapped.dev pkg-config];
+  nativeBuildInputs =
+    [php.unwrapped.dev pkg-config]
+    ++ lib.optional valgrindSupport valgrind;
 
   passthru = {
     inherit php libpfm stdenv;
@@ -34,9 +38,13 @@ buildPecl rec {
   outputs = ["out" "dev"];
 
   doCheck = checkSupport;
+  checkPhase =
+    ''
+      NO_INTERACTON=yes REPORT_EXIT_STATUS=yes make test
+    ''
+    + (lib.optionalString valgrindSupport ''
+      USE_ZEND_ALLOC=0 NO_INTERACTON=yes REPORT_EXIT_STATUS=yes make test TEST_PHP_ARGS=-m
+    '');
 
   #TEST_PHP_DETAILED = 1;
-  NO_INTERACTION = 1;
-  REPORT_EXIT_STATUS = 1;
-  TEST_PHP_ARGS = "-c ${php.phpIni}";
 }