aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/passwordcheck/Makefile3
-rw-r--r--contrib/passwordcheck/expected/passwordcheck.out1
-rw-r--r--contrib/passwordcheck/passwordcheck.conf1
-rw-r--r--contrib/passwordcheck/sql/passwordcheck.sql2
4 files changed, 3 insertions, 4 deletions
diff --git a/contrib/passwordcheck/Makefile b/contrib/passwordcheck/Makefile
index 7edc968b908..4da0b1417cb 100644
--- a/contrib/passwordcheck/Makefile
+++ b/contrib/passwordcheck/Makefile
@@ -8,10 +8,7 @@ PGFILEDESC = "passwordcheck - strengthen user password checks"
# PG_CPPFLAGS = -DUSE_CRACKLIB '-DCRACKLIB_DICTPATH="/usr/lib/cracklib_dict"'
# SHLIB_LINK = -lcrack
-REGRESS_OPTS = --temp-config $(srcdir)/passwordcheck.conf
REGRESS = passwordcheck
-# disabled because these tests require setting shared_preload_libraries
-NO_INSTALLCHECK = 1
ifdef USE_PGXS
PG_CONFIG = pg_config
diff --git a/contrib/passwordcheck/expected/passwordcheck.out b/contrib/passwordcheck/expected/passwordcheck.out
index b3515df3e83..e04cda6bd95 100644
--- a/contrib/passwordcheck/expected/passwordcheck.out
+++ b/contrib/passwordcheck/expected/passwordcheck.out
@@ -1,3 +1,4 @@
+LOAD 'passwordcheck';
CREATE USER regress_user1;
-- ok
ALTER USER regress_user1 PASSWORD 'a_nice_long_password';
diff --git a/contrib/passwordcheck/passwordcheck.conf b/contrib/passwordcheck/passwordcheck.conf
deleted file mode 100644
index f6604f3d6b7..00000000000
--- a/contrib/passwordcheck/passwordcheck.conf
+++ /dev/null
@@ -1 +0,0 @@
-shared_preload_libraries = 'passwordcheck'
diff --git a/contrib/passwordcheck/sql/passwordcheck.sql b/contrib/passwordcheck/sql/passwordcheck.sql
index 59c84f522ec..d98796ac494 100644
--- a/contrib/passwordcheck/sql/passwordcheck.sql
+++ b/contrib/passwordcheck/sql/passwordcheck.sql
@@ -1,3 +1,5 @@
+LOAD 'passwordcheck';
+
CREATE USER regress_user1;
-- ok