Browse Source

nixos/php: Move the pcre tests to the php test attribute

nsd-state-dir
Elis Hirwing 3 years ago
committed by talyz
parent
commit
0dc95728ba
No known key found for this signature in database GPG Key ID: 2DED2151F4671A2B
  1. 2
      nixos/release-combined.nix
  2. 4
      nixos/release-small.nix
  3. 1
      nixos/tests/all-tests.nix
  4. 1
      nixos/tests/php/default.nix
  5. 31
      nixos/tests/php/pcre.nix
  6. 4
      pkgs/development/interpreters/php/default.nix

2
nixos/release-combined.nix

@ -112,7 +112,7 @@ in rec {
"nixos.tests.nfs4.simple.x86_64-linux"
"nixos.tests.openssh.x86_64-linux"
"nixos.tests.pantheon.x86_64-linux"
"nixos.tests.php-pcre.x86_64-linux"
"nixos.tests.php.x86_64-linux"
"nixos.tests.plasma5.x86_64-linux"
"nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux"
"nixos.tests.predictable-interface-names.predictable.x86_64-linux"

4
nixos/release-small.nix

@ -40,7 +40,7 @@ in rec {
nat
nfs3
openssh
php-pcre
php
predictable-interface-names
proxy
simple;
@ -108,7 +108,7 @@ in rec {
"nixos.tests.nat.standalone.x86_64-linux"
"nixos.tests.nfs3.simple.x86_64-linux"
"nixos.tests.openssh.x86_64-linux"
"nixos.tests.php-pcre.x86_64-linux"
"nixos.tests.php.x86_64-linux"
"nixos.tests.predictable-interface-names.predictable.x86_64-linux"
"nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux"
"nixos.tests.predictable-interface-names.unpredictable.x86_64-linux"

1
nixos/tests/all-tests.nix

@ -241,7 +241,6 @@ in
pgjwt = handleTest ./pgjwt.nix {};
pgmanage = handleTest ./pgmanage.nix {};
php = handleTest ./php {};
php-pcre = handleTest ./php-pcre.nix {};
plasma5 = handleTest ./plasma5.nix {};
plotinus = handleTest ./plotinus.nix {};
postgis = handleTest ./postgis.nix {};

1
nixos/tests/php/default.nix

@ -3,4 +3,5 @@
pkgs ? import ../../.. { inherit system config; }
}: {
fpm = import ./fpm.nix { inherit system pkgs; };
pcre = import ./pcre.nix { inherit system pkgs; };
}

31
nixos/tests/php-pcre.nix → nixos/tests/php/pcre.nix

@ -1,7 +1,6 @@
let testString = "can-use-subgroups"; in
import ./make-test-python.nix ({ ...}: {
let
testString = "can-use-subgroups";
in import ../make-test-python.nix ({ ...}: {
name = "php-httpd-pcre-jit-test";
machine = { lib, pkgs, ... }: {
time.timeZone = "UTC";
@ -10,15 +9,13 @@ import ./make-test-python.nix ({ ...}: {
adminAddr = "please@dont.contact";
enablePHP = true;
phpOptions = "pcre.jit = true";
extraConfig =
let
extraConfig = let
testRoot = pkgs.writeText "index.php"
''
<?php
''
<?php
preg_match('/(${testString})/', '${testString}', $result);
var_dump($result);
?>
'';
'';
in
''
Alias / ${testRoot}/
@ -30,11 +27,11 @@ import ./make-test-python.nix ({ ...}: {
};
};
testScript = { ... }:
''
machine.wait_for_unit("httpd.service")
# Ensure php evaluation by matching on the var_dump syntax
assert 'string(${toString (builtins.stringLength testString)}) "${testString}"' in machine.succeed(
"curl -vvv -s http://127.0.0.1:80/index.php"
)
'';
''
machine.wait_for_unit("httpd.service")
# Ensure php evaluation by matching on the var_dump syntax
assert 'string(${toString (builtins.stringLength testString)}) "${testString}"' in machine.succeed(
"curl -vvv -s http://127.0.0.1:80/index.php"
)
'';
})

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

@ -1,4 +1,6 @@
# pcre functionality is tested in nixos/tests/php-pcre.nix
# We have tests for PCRE and PHP-FPM in nixos/tests/php/ or
# both in the same attribute named nixosTests.php
{ callPackage, config, fetchurl, lib, makeWrapper, stdenv, symlinkJoin
, writeText , autoconf, automake, bison, flex, libtool, pkgconfig, re2c
, apacheHttpd, libargon2, libxml2, pcre, pcre2 , systemd, valgrind

Loading…
Cancel
Save