Skip to content

Commit 0524f3b

Browse files
authored
Merge: nixosTests.postgresql: run tests with JIT as well (#355502)
2 parents ac313b3 + 9486472 commit 0524f3b

File tree

9 files changed

+14
-4
lines changed

9 files changed

+14
-4
lines changed

nixos/tests/postgresql/anonymizer.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ let
1919
services.postgresql = {
2020
inherit package;
2121
enable = true;
22+
enableJIT = lib.hasInfix "-jit-" package.name;
2223
extraPlugins = ps: [ ps.anonymizer ];
2324
settings.shared_preload_libraries = [ "anon" ];
2425
};

nixos/tests/postgresql/pgjwt.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ let
2323
services.postgresql = {
2424
inherit package;
2525
enable = true;
26+
enableJIT = lib.hasInfix "-jit-" package.name;
2627
extraPlugins =
2728
ps: with ps; [
2829
pgjwt

nixos/tests/postgresql/pgvecto-rs.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ let
2424
'';
2525

2626
makeTestFor =
27-
postgresqlPackage:
27+
package:
2828
makeTest {
29-
name = "pgvecto-rs-${postgresqlPackage.name}";
29+
name = "pgvecto-rs-${package.name}";
3030
meta = with lib.maintainers; {
3131
maintainers = [ diogotcorreia ];
3232
};
@@ -35,8 +35,9 @@ let
3535
{ ... }:
3636
{
3737
services.postgresql = {
38+
inherit package;
3839
enable = true;
39-
package = postgresqlPackage;
40+
enableJIT = lib.hasInfix "-jit-" package.name;
4041
extraPlugins =
4142
ps: with ps; [
4243
pgvecto-rs

nixos/tests/postgresql/postgresql-tls-client-cert.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ let
5050
services.postgresql = {
5151
inherit package;
5252
enable = true;
53+
enableJIT = lib.hasInfix "-jit-" package.name;
5354
enableTCPIP = true;
5455
ensureUsers = [
5556
{

nixos/tests/postgresql/postgresql-wal-receiver.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ let
3131
services.postgresql = {
3232
inherit package;
3333
enable = true;
34+
enableJIT = lib.hasInfix "-jit-" package.name;
3435
settings = {
3536
max_replication_slots = 10;
3637
max_wal_senders = 10;

nixos/tests/postgresql/postgresql.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ let
4040
{ ... }:
4141
{
4242
services.postgresql = {
43-
inherit (package) ;
43+
inherit package;
4444
enable = true;
45+
enableJIT = lib.hasInfix "-jit-" package.name;
4546
};
4647

4748
services.postgresqlBackup = {
@@ -158,6 +159,7 @@ let
158159
services.postgresql = {
159160
inherit package;
160161
enable = true;
162+
enableJIT = lib.hasInfix "-jit-" package.name;
161163
ensureUsers = [
162164
{
163165
name = "all-clauses";

nixos/tests/postgresql/timescaledb.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ let
5353
services.postgresql = {
5454
inherit package;
5555
enable = true;
56+
enableJIT = lib.hasInfix "-jit-" package.name;
5657
extraPlugins =
5758
ps: with ps; [
5859
timescaledb

nixos/tests/postgresql/tsja.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ let
2020
services.postgresql = {
2121
inherit package;
2222
enable = true;
23+
enableJIT = lib.hasInfix "-jit-" package.name;
2324
extraPlugins =
2425
ps: with ps; [
2526
tsja

nixos/tests/postgresql/wal2json.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ let
1616
services.postgresql = {
1717
inherit package;
1818
enable = true;
19+
enableJIT = lib.hasInfix "-jit-" package.name;
1920
extraPlugins = with package.pkgs; [ wal2json ];
2021
settings = {
2122
wal_level = "logical";

0 commit comments

Comments
 (0)