Simplify new test suite handling of passwordcheck

petere · petere · commit 637a934ab9ba · 2017-11-02T12:57:04.000-04:00
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
@@ -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
@@ -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
diff --git a/contrib/passwordcheck/sql/passwordcheck.sql b/contrib/passwordcheck/sql/passwordcheck.sql
@@ -1,3 +1,5 @@
+LOAD 'passwordcheck';
+
 CREATE USER regress_user1;
 
 -- ok

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+LOAD 'passwordcheck';`
`1`	`2`	`CREATE USER regress_user1;`
`2`	`3`	`-- ok`
`3`	`4`	`ALTER USER regress_user1 PASSWORD 'a_nice_long_password';`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+LOAD 'passwordcheck';`
	`2`	`+`
`1`	`3`	`CREATE USER regress_user1;`
`2`	`4`
`3`	`5`	`-- ok`