Combine make-test/make-results/verify-results into one suite

template-multi-extension/test/expected/base.out

@@ -1,2 +1,3 @@
+\set ECHO none
 
 multi_ext_ok

template-multi-extension/test/sql/base.sql

@@ -1,3 +1,6 @@
+\set ECHO none
+-- DO NOT REMOVE: pg_regress runs psql with echo-all, so without this the SQL
+-- input is echoed into the output and never matches expected/base.out.
 \a
 \t
 SELECT pg_sleep(.1);

test/lib/foundation.bats

@@ -29,7 +29,7 @@
 #
 # All other tests depend on this foundation:
 # - Sequential tests (01-meta, 02-dist, 03-setup-final) build on this base
-# - Independent tests (doc, make-results) copy this base to their own environment
+# - Independent tests (doc, make-test) copy this base to their own environment
 #
 # The foundation is created once in .envs/foundation/ and then copied to other
 # test environments for speed. Run `make foundation` to rebuild from scratch.

test/sequential/00-validate-tests.bats

@@ -191,7 +191,7 @@ teardown_file() {
   done
 }
 
-@test "only make-results tests call make results" {
+@test "only make-test tests call make results" {
   # make results overwrites expected output files, so it should only be used
   # in tests specifically designed to test that functionality.
   local test_root="$BATS_TEST_DIRNAME/.."
@@ -205,8 +205,8 @@ teardown_file() {
   fi
   assert_success  # Any status other than 0 or 1 is a real grep error
 
-  # Filter out the tests that are allowed to call make results
-  run grep -v -e 'make-results\.bats$' -e 'test-verify-results\.bats$' <<< "$output"
+  # Filter out the test that is allowed to call make results
+  run grep -v -e 'make-test\.bats$' <<< "$output"
 
   # grep returns 1 when all lines are filtered out -- that's the success case
   if [ "$status" -eq 1 ]; then
@@ -217,7 +217,7 @@ teardown_file() {
   # If we get here, there are violations (grep returned 0, meaning matches remain)
   echo "FAIL: The following tests call 'make results' but should not:" >&2
   echo "$output" >&2
-  echo "Only make-results.bats and test-verify-results.bats may call 'make results'" >&2
+  echo "Only make-test.bats may call 'make results'" >&2
   return 1
 }