Browse Source

php: Add nixos test to ensure php-pcre works in httpd

nsd-state-dir
Sarah Brofeldt 5 years ago
parent
commit
58d07e2d6b
  1. 1
      nixos/release-combined.nix
  2. 1
      nixos/release.nix
  3. 44
      nixos/tests/php-pcre.nix
  4. 1
      pkgs/development/interpreters/php/default.nix

1
nixos/release-combined.nix

@ -109,6 +109,7 @@ in rec {
(all nixos.tests.nfs3)
(all nixos.tests.nfs4)
(all nixos.tests.openssh)
(all nixos.tests.php-pcre)
(all nixos.tests.printing)
(all nixos.tests.proxy)
(all nixos.tests.sddm.default)

1
nixos/release.nix

@ -309,6 +309,7 @@ in rec {
tests.pam-oath-login = callTest tests/pam-oath-login.nix {};
#tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
tests.peerflix = callTest tests/peerflix.nix {};
tests.php-pcre = callTest tests/php-pcre.nix {};
tests.postgresql = callSubTests tests/postgresql.nix {};
tests.pgmanage = callTest tests/pgmanage.nix {};
tests.postgis = callTest tests/postgis.nix {};

44
nixos/tests/php-pcre.nix

@ -0,0 +1,44 @@
let testString = "can-use-subgroups"; in
import ./make-test.nix ({ pkgs, ...}: {
name = "php-httpd-pcre-jit-test";
machine = { config, lib, pkgs, ... }: {
time.timeZone = "UTC";
services.httpd = {
enable = true;
adminAddr = "please@dont.contact";
extraSubservices = lib.singleton {
function = f: {
enablePHP = true;
phpOptions = "pcre.jit = true";
extraConfig =
let
testRoot = pkgs.writeText "index.php"
''
<?php
preg_match('/(${testString})/', '${testString}', $result);
var_dump($result);
?>
'';
in
''
Alias / ${testRoot}/
<Directory ${testRoot}>
Require all granted
</Directory>
'';
};
};
};
};
testScript = { nodes, ... }:
''
$machine->waitForUnit('httpd.service');
# Ensure php evaluation by matching on the var_dump syntax
$machine->succeed('curl -vvv -s http://127.0.0.1:80/index.php \
| grep "string(${toString (builtins.stringLength testString)}) \"${testString}\""');
'';
})

1
pkgs/development/interpreters/php/default.nix

@ -91,6 +91,7 @@ let
configureFlags = [ "--enable-pcntl" ];
};
# pcre functionality is tested in nixos/tests/php-pcre.nix
pcre = {
configureFlags = ["--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"];
buildInputs = [ pcre ];

Loading…
Cancel
Save