Fix a few contrib regression test scripts that hadn't gotten the word

about best practice for including the module creation scripts: to wit
that you should suppress NOTICE messages.  This avoids creating
regression failures by adding or removing comment lines in the module
scripts.

2 files changed, 4 insertions, 15 deletions

diff --git a/contrib/btree_gist/expected/init.out b/contrib/btree_gist/expected/init.out
index 1dbbfd74ec2..c8082495456 100644
--- a/contrib/btree_gist/expected/init.out
+++ b/contrib/btree_gist/expected/init.out
@@ -2,19 +2,6 @@
 -- first, define the datatype.  Turn off echoing so that expected file
 -- does not depend on contents of btree_gist.sql.
 --
+SET client_min_messages = warning;
 \set ECHO none
-psql:btree_gist.sql:7: NOTICE:  type "gbtreekey4" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:btree_gist.sql:12: NOTICE:  argument type gbtreekey4 is only a shell
-psql:btree_gist.sql:23: NOTICE:  type "gbtreekey8" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:btree_gist.sql:28: NOTICE:  argument type gbtreekey8 is only a shell
-psql:btree_gist.sql:39: NOTICE:  type "gbtreekey16" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:btree_gist.sql:44: NOTICE:  argument type gbtreekey16 is only a shell
-psql:btree_gist.sql:55: NOTICE:  type "gbtreekey32" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:btree_gist.sql:60: NOTICE:  argument type gbtreekey32 is only a shell
-psql:btree_gist.sql:71: NOTICE:  type "gbtreekey_var" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:btree_gist.sql:76: NOTICE:  argument type gbtreekey_var is only a shell
+RESET client_min_messages;
diff --git a/contrib/btree_gist/sql/init.sql b/contrib/btree_gist/sql/init.sql
index 04fdc845f52..7fafde12d8b 100644
--- a/contrib/btree_gist/sql/init.sql
+++ b/contrib/btree_gist/sql/init.sql
@@ -2,6 +2,8 @@
 -- first, define the datatype.  Turn off echoing so that expected file
 -- does not depend on contents of btree_gist.sql.
 --
+SET client_min_messages = warning;
 \set ECHO none
 \i btree_gist.sql
 \set ECHO all
+RESET client_min_messages;