From 3f6861332cfbcbc276e0d9a4ef9be39f2cd391f8 Mon Sep 17 00:00:00 2001
From: Christoph Berg <myon@debian.org>
Date: Thu, 5 Oct 2023 16:08:44 +0200
Subject: [PATCH] make test: Don't track NOTICEs

There's little value in tracking the noise of NOTICEs emitted during
loading pg_sphere.test.sql, so just mute them.

The gain from this change is that future patches will not have to update
the changed line numbers in the output tracked. (Cf. c2a235160)
---
 Makefile                          |  6 +-----
 expected/init_test.out            |  2 ++
 expected/init_test.out.in         | 35 -------------------------------
 expected/init_test_healpix.out.in |  2 --
 sql/init_test.sql                 |  3 +--
 5 files changed, 4 insertions(+), 44 deletions(-)
 create mode 100644 expected/init_test.out
 delete mode 100644 expected/init_test.out.in
 delete mode 100644 expected/init_test_healpix.out.in

diff --git a/Makefile b/Makefile
index a016313e..4e44ec67 100644
--- a/Makefile
+++ b/Makefile
@@ -120,11 +120,7 @@ ifeq ($(has_explain_summary),y)
 endif
 endif
 
-test: pg_sphere.test.sql sql/init_test.sql
-	cp expected/init_test.out.in expected/init_test.out
-ifneq ($(USE_HEALPIX),0)
-	cat expected/init_test_healpix.out.in >> expected/init_test.out
-endif
+test: pg_sphere.test.sql
 	$(pg_regress_installcheck) --temp-instance=tmp_check $(REGRESS_OPTS) $(TESTS)
 
 pg_sphere.test.sql: $(RELEASE_SQL) $(shlib)
diff --git a/expected/init_test.out b/expected/init_test.out
new file mode 100644
index 00000000..da0e94be
--- /dev/null
+++ b/expected/init_test.out
@@ -0,0 +1,2 @@
+SET client_min_messages TO WARNING;
+\set ECHO none
diff --git a/expected/init_test.out.in b/expected/init_test.out.in
deleted file mode 100644
index 6fbd06bd..00000000
--- a/expected/init_test.out.in
+++ /dev/null
@@ -1,35 +0,0 @@
-SET client_min_messages TO NOTICE;
-\set ECHO none
-psql:pg_sphere.test.sql:9: NOTICE:  type "spoint" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:pg_sphere.test.sql:16: NOTICE:  argument type spoint is only a shell
-psql:pg_sphere.test.sql:32: NOTICE:  type "strans" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:pg_sphere.test.sql:39: NOTICE:  argument type strans is only a shell
-psql:pg_sphere.test.sql:55: NOTICE:  type "scircle" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:pg_sphere.test.sql:62: NOTICE:  argument type scircle is only a shell
-psql:pg_sphere.test.sql:78: NOTICE:  type "sline" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:pg_sphere.test.sql:85: NOTICE:  argument type sline is only a shell
-psql:pg_sphere.test.sql:101: NOTICE:  type "sellipse" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:pg_sphere.test.sql:108: NOTICE:  argument type sellipse is only a shell
-psql:pg_sphere.test.sql:126: NOTICE:  type "spoly" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:pg_sphere.test.sql:133: NOTICE:  argument type spoly is only a shell
-psql:pg_sphere.test.sql:151: NOTICE:  type "spath" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:pg_sphere.test.sql:158: NOTICE:  argument type spath is only a shell
-psql:pg_sphere.test.sql:177: NOTICE:  type "sbox" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:pg_sphere.test.sql:184: NOTICE:  argument type sbox is only a shell
-psql:pg_sphere.test.sql:8658: NOTICE:  type "spherekey" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:pg_sphere.test.sql:8665: NOTICE:  argument type spherekey is only a shell
-psql:pg_sphere.test.sql:8679: NOTICE:  type "pointkey" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:pg_sphere.test.sql:8686: NOTICE:  argument type pointkey is only a shell
-psql:pg_sphere.test.sql:8692: NOTICE:  argument type pointkey is only a shell
-psql:pg_sphere.test.sql:8698: NOTICE:  argument type pointkey is only a shell
-psql:pg_sphere.test.sql:8704: NOTICE:  argument type pointkey is only a shell
diff --git a/expected/init_test_healpix.out.in b/expected/init_test_healpix.out.in
deleted file mode 100644
index 95de0db7..00000000
--- a/expected/init_test_healpix.out.in
+++ /dev/null
@@ -1,2 +0,0 @@
-psql:pg_sphere.test.sql:9685: NOTICE:  return type smoc is only a shell
-psql:pg_sphere.test.sql:9691: NOTICE:  argument type smoc is only a shell
diff --git a/sql/init_test.sql b/sql/init_test.sql
index b2793be5..6ef6e89d 100644
--- a/sql/init_test.sql
+++ b/sql/init_test.sql
@@ -1,4 +1,3 @@
-SET client_min_messages TO NOTICE;
+SET client_min_messages TO WARNING;
 \set ECHO none
 \i pg_sphere.test.sql
-\set ECHO all