Simplify new test suite handling of passwordcheck

This changes the use of a custom configuration file to enforce the value
of preload_shared_libraries to simply load the library during the tests.
This removes the restriction of running installcheck on the tests, and
simplifies its makefile contrary to what has been introduced in af7211e.

Author: Michael Paquier <michael.paquier@gmail.com>

diff --git a/contrib/passwordcheck/Makefile b/contrib/passwordcheck/Makefile
index 7edc968b9083d557bcbc1942cb2b27f2d89252e1..4da0b1417cbb23a4312e1cf7d8029ee8fe0767f9 100644 (file)
--- 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 b3515df3e833b28b382e993ab5e50ccb7ae4aab5..e04cda6bd956659f79483b02e99dc7bc09ac989a 100644 (file)
--- 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 (file)
index f6604f3..0000000
--- 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 59c84f522ec801aebf52fa85b652585cb0bd65e1..d98796ac494cf78a52b6b3ea438d61824c1de302 100644 (file)
--- a/contrib/passwordcheck/sql/passwordcheck.sql
+++ b/contrib/passwordcheck/sql/passwordcheck.sql
@@ -1,3 +1,5 @@
+LOAD 'passwordcheck';
+
 CREATE USER regress_user1;
 
 -- ok