diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2017-11-12 08:05:27 +0100 |
|---|---|---|
| committer | Sarah Brofeldt <sbrofeldt@gmail.com> | 2017-11-12 08:05:27 +0100 |
| commit | 58d07e2d6bd4377abe1b5ba1735c256a52ea01bc (patch) | |
| tree | 74a19b8d597e896a49171d4899f1442072cf5062 /nixos | |
| parent | c7891595c92f9f687f29d7187b5c87b4042df226 (diff) | |
| download | nixlib-58d07e2d6bd4377abe1b5ba1735c256a52ea01bc.tar nixlib-58d07e2d6bd4377abe1b5ba1735c256a52ea01bc.tar.gz nixlib-58d07e2d6bd4377abe1b5ba1735c256a52ea01bc.tar.bz2 nixlib-58d07e2d6bd4377abe1b5ba1735c256a52ea01bc.tar.lz nixlib-58d07e2d6bd4377abe1b5ba1735c256a52ea01bc.tar.xz nixlib-58d07e2d6bd4377abe1b5ba1735c256a52ea01bc.tar.zst nixlib-58d07e2d6bd4377abe1b5ba1735c256a52ea01bc.zip | |
php: Add nixos test to ensure php-pcre works in httpd
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/release-combined.nix | 1 | ||||
| -rw-r--r-- | nixos/release.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/php-pcre.nix | 44 |
3 files changed, 46 insertions, 0 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 125e6b7050bc..7536bf3e48ef 100644 --- a/nixos/release-combined.nix +++ b/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) diff --git a/nixos/release.nix b/nixos/release.nix index 28eb76d888e4..e02851ac45ae 100644 --- a/nixos/release.nix +++ b/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 {}; diff --git a/nixos/tests/php-pcre.nix b/nixos/tests/php-pcre.nix new file mode 100644 index 000000000000..f618a39a2293 --- /dev/null +++ b/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}\""'); + ''; +}) |