From 5a9418629f00b7a563544ae10ee231460839677a Mon Sep 17 00:00:00 2001
From: jnasbyupgrade <jnasby@upgrade.com>
Date: Mon, 12 Oct 2026 18:33:55 -0500
Subject: [PATCH 1/7] Test `make test`'s pgTap output check

Add tests for https://github.com/Postgres-Extensions/pgxntool/pull/141
(commit d62a875, part of Postgres-Extensions/pgxntool#106):
- `make test` fails on pgTap failures, missing or duplicate plans and
  plan/count mismatches in `test/results` and `test/install` output
- `verify-results-pgtap.sh` uses the same check, with the `test/install`
  outputs as extra arguments

- New `check-tap-output-script.bats` invokes the script directly and
  covers each failure rule, non-TAP pass-through, `1..0`, subtests and
  nonexistent arguments.
- `verify-results-pgtap-script.bats` covers the plan checks and the
  extra file arguments.
- `make-test.bats` covers wiring only: the arguments (dry run), the
  `PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=no` skip and exit-status propagation
  (stub), and one end-to-end case where a blessed `not ok` fails
  `make test`.
- Add the new variables to `pgxntool-variables.txt` and the new script
  to `dist-expected-files.txt`.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 test/lib/dist-expected-files.txt              |   1 +
 test/lib/pgxntool-variables.txt               |   3 +
 test/standard/check-tap-output-script.bats    | 155 ++++++++++++++++++
 test/standard/make-test.bats                  |  78 +++++++++
 .../standard/verify-results-pgtap-script.bats |  47 +++++-
 5 files changed, 280 insertions(+), 4 deletions(-)
 create mode 100644 test/standard/check-tap-output-script.bats

diff --git a/test/lib/dist-expected-files.txt b/test/lib/dist-expected-files.txt
index b6e21b3..6aef1dd 100644
--- a/test/lib/dist-expected-files.txt
+++ b/test/lib/dist-expected-files.txt
@@ -90,6 +90,7 @@ pgxntool/WHAT_IS_THIS
 pgxntool/test/
 pgxntool/test/bin/
 pgxntool/test/bin/check-stale-expected.sh
+pgxntool/test/bin/check-tap-output.sh
 pgxntool/test/bin/check-test-install-error-stop.sh
 pgxntool/test/deps.sql
 pgxntool/test/pgxntool/
diff --git a/test/lib/pgxntool-variables.txt b/test/lib/pgxntool-variables.txt
index 7f4ab5f..ef50d91 100644
--- a/test/lib/pgxntool-variables.txt
+++ b/test/lib/pgxntool-variables.txt
@@ -36,6 +36,7 @@ legacy   PGVERSION
 api      PGXNTOOL_CHECK_EXPECTED_FILE_TYPES
 legacy   PGXNTOOL_DIR
 api      PGXNTOOL_ENABLE_CHECK_STALE_EXPECTED
+api      PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT
 api      PGXNTOOL_ENABLE_FS_INSTALL
 api      PGXNTOOL_ENABLE_PGXN_INSTALL
 api      PGXNTOOL_ENABLE_TEST_BUILD
@@ -64,12 +65,14 @@ legacy   TEST_RESULT_FILES
 legacy   TEST_SQL_FILES
 internal _PGXNTOOL_BASE_MK_INCLUDED
 internal _PGXNTOOL_CHECK_STALE_EXPECTED_SCRIPT
+internal _PGXNTOOL_CHECK_TAP_OUTPUT_SCRIPT
 internal _PGXNTOOL_CHECK_TEST_INSTALL_ERROR_STOP_SCRIPT
 internal _PGXNTOOL_CONTROL_FILES
 internal _PGXNTOOL_DUPLICATE_DOCS
 internal _PGXNTOOL_EXTENSIONS
 internal _PGXNTOOL_INSTALL_SCHEDULE
 internal _PGXNTOOL_POST_TAG_VERSION_BUMP_SCRIPT
+internal _PGXNTOOL_TEST_INSTALL_OUTPUT_FILES
 internal _pgxntool_docs_named
 internal _pgxntool_validate_choice
 legacy   pgxntool-sync-local
diff --git a/test/standard/check-tap-output-script.bats b/test/standard/check-tap-output-script.bats
new file mode 100644
index 0000000..0eb1385
--- /dev/null
+++ b/test/standard/check-tap-output-script.bats
@@ -0,0 +1,155 @@
+#!/usr/bin/env bats
+
+# Test: check-tap-output.sh - pure script-logic unit tests
+#
+# These tests invoke test/bin/check-tap-output.sh directly on scratch files --
+# no foundation environment, no `make`, no PostgreSQL. They own all of its
+# decision logic: what counts as TAP output, and which TAP output fails.
+#
+# make-test.bats covers only base.mk's wiring (which files `make test` passes
+# in, the PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=no skip, exit-status propagation)
+# plus one real end-to-end failure; verify-results-pgtap-script.bats covers
+# verify-results-pgtap.sh's use of this script.
+
+load ../lib/helpers
+load ../lib/assertions
+
+setup_file() {
+  setup_topdir
+  load_test_env "check-tap-output-script"  # only resolves PGXNREPO; creates no foundation
+}
+
+setup() {
+  load_test_env "check-tap-output-script"  # only resolves PGXNREPO; creates no foundation
+  export SCRIPT="$PGXNREPO/test/bin/check-tap-output.sh"
+  export OUTDIR="$BATS_TEST_TMPDIR/out"
+  mkdir -p "$OUTDIR"
+}
+
+# Write $2 as the content of $OUTDIR/$1.out.
+write_out() {
+  printf '%s\n' "$2" > "$OUTDIR/$1.out"
+}
+
+@test "check-tap-output.sh: passes clean TAP output, a skip_all 1..0, and TODO failures" {
+  write_out clean '\set ECHO none
+1..2
+ok 1
+ok 2 - described
+# TRANSACTION INTENTIONALLY LEFT OPEN!'
+  write_out skipall '1..0 # Skipped: nothing to do here'
+  write_out todo '1..2
+ok 1
+not ok 2 - known issue # TODO fix later'
+
+  run "$SCRIPT" "$OUTDIR/clean.out" "$OUTDIR/skipall.out" "$OUTDIR/todo.out"
+  assert_success
+  [ -z "$output" ] || error "expected no output, got: $output"
+}
+
+@test "check-tap-output.sh: passes non-TAP files and ignores nonexistent arguments" {
+  # Plain SQL output is not TAP even if it mentions pgTap's phrases mid-line,
+  # and an unmatched shell glob arrives as a literal, nonexistent path.
+  write_out plain '\set ECHO none
+
+ x
+---
+ not ok here
+(1 row)'
+
+  run "$SCRIPT" "$OUTDIR/plain.out" "$OUTDIR/missing.out" "$OUTDIR/nomatch/*.out"
+  assert_success
+
+  run "$SCRIPT"
+  assert_success
+}
+
+@test "check-tap-output.sh: fails on a not ok without TODO" {
+  write_out failing '1..2
+ok 1
+not ok 2 - broken'
+
+  run "$SCRIPT" "$OUTDIR/failing.out"
+  assert_failure_with_status 1
+  assert_contains "$output" "pgtap failure detected in $OUTDIR/failing.out"
+  assert_contains "$output" "not ok 2 - broken"
+}
+
+@test "check-tap-output.sh: fails on pgTap's 'Looks like you planned' line" {
+  write_out planned '1..3
+ok 1
+ok 2
+# Looks like you planned 3 tests but ran 2'
+
+  run "$SCRIPT" "$OUTDIR/planned.out"
+  assert_failure_with_status 1
+  assert_contains "$output" "pgtap plan mismatch in $OUTDIR/planned.out"
+  assert_contains "$output" "Looks like you planned 3 tests but ran 2"
+  # pgTap's own line already says it; no second count message.
+  assert_not_contains "$output" "but found"
+}
+
+@test "check-tap-output.sh: fails when there is no plan line" {
+  # A no_plan() test that died before finish() printed its plan.
+  write_out noplan 'ok 1
+ok 2'
+
+  run "$SCRIPT" "$OUTDIR/noplan.out"
+  assert_failure_with_status 1
+  assert_contains "$output" "$OUTDIR/noplan.out has no plan line"
+}
+
+@test "check-tap-output.sh: fails on more than one plan line" {
+  write_out twoplans '1..1
+ok 1
+1..1'
+
+  run "$SCRIPT" "$OUTDIR/twoplans.out"
+  assert_failure_with_status 1
+  assert_contains "$output" "$OUTDIR/twoplans.out has 2 plan lines"
+}
+
+@test "check-tap-output.sh: fails when the test count differs from the plan" {
+  # A plan(N) test that died partway through: no pgTap mismatch line at all.
+  write_out short '1..3
+ok 1
+ERROR:  boom'
+  write_out long '1..1
+ok 1
+ok 2'
+
+  run "$SCRIPT" "$OUTDIR/short.out"
+  assert_failure_with_status 1
+  assert_contains "$output" "plan mismatch in $OUTDIR/short.out: planned 3 tests but found 1"
+
+  run "$SCRIPT" "$OUTDIR/long.out"
+  assert_failure_with_status 1
+  assert_contains "$output" "planned 1 tests but found 2"
+}
+
+@test "check-tap-output.sh: counts only top-level lines, so subtests don't skew the plan" {
+  write_out subtest '1..1
+    1..2
+    ok 1
+    not ok 2
+ok 1 - subtest'
+
+  run "$SCRIPT" "$OUTDIR/subtest.out"
+  assert_success
+}
+
+@test "check-tap-output.sh: reports every failing file and fails if any one fails" {
+  write_out good '1..1
+ok 1'
+  write_out bad1 '1..1
+not ok 1'
+  write_out bad2 'ok 1'
+
+  run "$SCRIPT" "$OUTDIR/good.out" "$OUTDIR/bad1.out" "$OUTDIR/bad2.out"
+  assert_failure_with_status 1
+  assert_contains "$output" "bad1.out"
+  assert_contains "$output" "bad2.out"
+  assert_not_contains "$output" "good.out"
+}
+
+# vi: expandtab ts=2 sw=2
diff --git a/test/standard/make-test.bats b/test/standard/make-test.bats
index 9ab4169..d3aa3ef 100755
--- a/test/standard/make-test.bats
+++ b/test/standard/make-test.bats
@@ -559,6 +559,61 @@ EOF
   assert_success
 }
 
+# Test: TAP output check in the `test` recipe (issue #106)
+#
+# Which TAP output fails is check-tap-output.sh's own logic, covered in
+# check-tap-output-script.bats. These cover base.mk's wiring only: the files
+# the recipe passes in, the PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=no skip, and that
+# the script's exit status decides `make test`. The one real end-to-end case
+# (a blessed `not ok`) is in the verify-results section below, since seeding it
+# needs `make results`.
+
+@test "test and verify-results pass results/*.out and the test/install actual output to the TAP check" {
+  # The template has test/install/create_install_marker.sql; its actual output
+  # is $(TESTOUT)/install/<name>.out (TESTOUT defaults to test).
+  run make -n test
+  assert_success
+  assert_contains "$output" "test/bin/check-tap-output.sh test/results/*.out test/install/create_install_marker.out"
+
+  run make -n verify-results
+  assert_success
+  assert_contains "$output" "verify-results-pgtap.sh test test/install/create_install_marker.out"
+
+  run make -n test PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=no
+  assert_success
+  assert_not_contains "$output" "check-tap-output.sh"
+}
+
+@test "PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT rejects invalid values" {
+  run make -n test PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=maybe
+  assert_failure
+  assert_contains "$output" "PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT"
+}
+
+@test "make test runs the TAP check stub, takes its exit status, and skips it when disabled" {
+  skip_if_no_postgres
+
+  local marker="$BATS_TEST_TMPDIR/check-tap-output-invoked"
+  local stub_script
+
+  stub_script=$(make_stub_script fail-stub 5 "STUB SENTINEL MESSAGE")
+  run make test _PGXNTOOL_CHECK_TAP_OUTPUT_SCRIPT="$stub_script"
+  assert_failure
+  assert_contains "$output" "STUB SENTINEL MESSAGE"
+
+  stub_script=$(make_stub_script pass-stub 0 "" "$marker")
+  run make test _PGXNTOOL_CHECK_TAP_OUTPUT_SCRIPT="$stub_script"
+  assert_success
+  assert_file_exists "$marker"
+
+  # Disabled: never invoked at all, not merely tolerated.
+  rm -f "$marker"
+  stub_script=$(make_stub_script disabled-stub 1 "" "$marker")
+  run make test PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=no _PGXNTOOL_CHECK_TAP_OUTPUT_SCRIPT="$stub_script"
+  assert_success
+  assert_file_not_exists "$marker"
+}
+
 # ============================================================================
 # verify-results / make results (issues #14, #49)
 # ============================================================================
@@ -733,6 +788,29 @@ EOF
   rm -f test/sql/brand_new.sql test/expected/brand_new.out test/results/brand_new.out
 }
 
+@test "make test fails on a not ok that was blessed into expected output (issue #106)" {
+  skip_if_no_postgres
+
+  # Actual output matches expected byte for byte, so regression.diffs stays
+  # absent; only the TAP check can fail this. Blessing it needs the
+  # PGXNTOOL_ENABLE_VERIFY_RESULTS=no escape hatch, which must keep working
+  # because the TAP check lives in the `test` recipe, not TEST_DEPS.
+  sed -e 's/, 3$/, 4/' test/sql/pgxntool-test.sql > test/sql/blessed_fail.sql
+  grep -q ', 4$' test/sql/blessed_fail.sql || error "failed to create a failing test from test/sql/pgxntool-test.sql"
+
+  run make PGXNTOOL_ENABLE_VERIFY_RESULTS=no results
+  assert_success
+  assert_file_exists test/expected/blessed_fail.out
+  grep -q '^not ok' test/expected/blessed_fail.out || error "blessed_fail.out has no 'not ok' line"
+
+  run make test
+  assert_failure
+  assert_contains "$output" "pgtap failure detected in test/results/blessed_fail.out"
+  assert_file_not_exists test/regression.diffs
+
+  rm -f test/sql/blessed_fail.sql test/expected/blessed_fail.out test/results/blessed_fail.out
+}
+
 @test "verify-results propagates a pgtap failure the script detects" {
   skip_if_no_postgres
 
diff --git a/test/standard/verify-results-pgtap-script.bats b/test/standard/verify-results-pgtap-script.bats
index def95b3..7f19e4b 100644
--- a/test/standard/verify-results-pgtap-script.bats
+++ b/test/standard/verify-results-pgtap-script.bats
@@ -4,10 +4,12 @@
 #
 # These tests exercise pgxntool's verify-results-pgtap.sh directly against a
 # bare scratch directory -- no foundation environment, no `make`, no
-# PostgreSQL. They own all of the script's decision logic: which pgtap output
-# in results/*.out counts as a failure, and which regression.diffs entries
-# block `make results` (a real mismatch against an existing baseline) versus
-# which are a brand-new test that has no expected output yet (issue #119).
+# PostgreSQL. They own all of the script's decision logic: which regression.diffs
+# entries block `make results` (a real mismatch against an existing baseline)
+# versus which are a brand-new test that has no expected output yet (issue
+# #119), and that its TAP phase hands results/*.out plus any extra file
+# arguments to check-tap-output.sh. Which TAP output fails is that script's
+# logic, covered in check-tap-output-script.bats.
 #
 # Tests that need real Make/PostgreSQL integration stay in make-test.bats:
 # that `make verify-results` invokes this script and propagates its exit
@@ -310,6 +312,43 @@ ok 2
   assert_contains "$output" "pgtap plan mismatch"
 }
 
+@test "verify-results-pgtap.sh: blocks on a missing or miscounted plan" {
+  write_results noplan 'ok 1'
+
+  run "$SCRIPT" "$TESTOUT"
+  assert_failure_with_status 1
+  assert_contains "$output" "noplan.out has no plan line"
+  assert_contains "$output" "Cannot run 'make results'"
+
+  rm -f "$TESTOUT/results/noplan.out"
+  write_results short '1..2
+ok 1'
+
+  run "$SCRIPT" "$TESTOUT"
+  assert_failure_with_status 1
+  assert_contains "$output" "planned 2 tests but found 1"
+  assert_contains "$output" "Cannot run 'make results'"
+}
+
+@test "verify-results-pgtap.sh: also scans extra file arguments (test/install output)" {
+  # base.mk passes each test/install actual output, which lives outside
+  # results/. A nonexistent one (an install file that never ran) is ignored.
+  write_results passing '1..1
+ok 1'
+  mkdir -p "$TESTOUT/install"
+  printf '1..1\nok 1\n' > "$TESTOUT/install/good.out"
+
+  run "$SCRIPT" "$TESTOUT" "$TESTOUT/install/good.out" "$TESTOUT/install/missing.out"
+  assert_success
+
+  printf '1..1\nnot ok 1 - install broke\n' > "$TESTOUT/install/bad.out"
+
+  run "$SCRIPT" "$TESTOUT" "$TESTOUT/install/good.out" "$TESTOUT/install/bad.out"
+  assert_failure_with_status 1
+  assert_contains "$output" "pgtap failure detected in $TESTOUT/install/bad.out"
+  assert_contains "$output" "Cannot run 'make results'"
+}
+
 @test "verify-results-pgtap.sh: usage error when called with no TESTOUT argument" {
   run "$SCRIPT"
   assert_failure

From 3d29e8d14cdbc68d9f564c2d44cd93c324731355 Mon Sep 17 00:00:00 2001
From: jnasbyupgrade <jnasby@upgrade.com>
Date: Mon, 12 Oct 2026 18:37:21 -0500
Subject: [PATCH 2/7] Test that a completed no_plan() run (plan line last)
 passes the TAP check

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 test/standard/check-tap-output-script.bats | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/standard/check-tap-output-script.bats b/test/standard/check-tap-output-script.bats
index 0eb1385..1928c84 100644
--- a/test/standard/check-tap-output-script.bats
+++ b/test/standard/check-tap-output-script.bats
@@ -31,18 +31,23 @@ write_out() {
   printf '%s\n' "$2" > "$OUTDIR/$1.out"
 }
 
-@test "check-tap-output.sh: passes clean TAP output, a skip_all 1..0, and TODO failures" {
+@test "check-tap-output.sh: passes clean TAP output, no_plan() (plan last), a skip_all 1..0, and TODO failures" {
   write_out clean '\set ECHO none
 1..2
 ok 1
 ok 2 - described
+# TRANSACTION INTENTIONALLY LEFT OPEN!'
+  write_out noplan '\set ECHO none
+ok 1
+ok 2 - described
+1..2
 # TRANSACTION INTENTIONALLY LEFT OPEN!'
   write_out skipall '1..0 # Skipped: nothing to do here'
   write_out todo '1..2
 ok 1
 not ok 2 - known issue # TODO fix later'
 
-  run "$SCRIPT" "$OUTDIR/clean.out" "$OUTDIR/skipall.out" "$OUTDIR/todo.out"
+  run "$SCRIPT" "$OUTDIR/clean.out" "$OUTDIR/noplan.out" "$OUTDIR/skipall.out" "$OUTDIR/todo.out"
   assert_success
   [ -z "$output" ] || error "expected no output, got: $output"
 }

From 9d6ac86cb908c8400fa047a80d03b9ff6542b332 Mon Sep 17 00:00:00 2001
From: jnasbyupgrade <jnasby@upgrade.com>
Date: Wed, 14 Oct 2026 14:04:37 -0500
Subject: [PATCH 3/7] Test the `test/install` symlink for a separate `TESTOUT`

Add tests for Postgres-Extensions/pgxntool@3e8be3f (part of
https://github.com/Postgres-Extensions/pgxntool/pull/141): with
`TESTOUT` different from `TESTDIR`, `_test-install-output-link` makes
`$(TESTOUT)/install` a symlink to `$(TESTDIR)/install`, and fails
rather than replace a pre-existing directory there.

Both checks run without Postgres, folded into the existing schedule
test in `test-test-install.bats`.
---
 test/standard/test-test-install.bats | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/test/standard/test-test-install.bats b/test/standard/test-test-install.bats
index a627bd8..47ae0f5 100644
--- a/test/standard/test-test-install.bats
+++ b/test/standard/test-test-install.bats
@@ -5,6 +5,7 @@
 # Tests the complete test/install lifecycle:
 # - Auto-detection: enabled when test/install/ has SQL files
 # - Schedule generation with ../install/ relative paths
+# - The $(TESTOUT)/install symlink used when TESTOUT differs from TESTDIR
 # - Core contract: install state persists into main test suite
 # - Disabling via PGXNTOOL_ENABLE_TEST_INSTALL
 # - PGXNTOOL_ENABLE_TEST_INSTALL=yes erroring when test/install/ is empty
@@ -45,6 +46,23 @@ setup() {
   # Schedule should reference install files with relative path
   run grep "../install/" test/install/schedule
   assert_success
+
+  # Those ../install/ paths resolve against TESTOUT for actual output but
+  # against TESTDIR for expected output, so a separate TESTOUT gets a
+  # symlink back to TESTDIR's install directory.
+  local out="$BATS_TEST_TMPDIR/testout"
+  run make _test-install-output-link TESTOUT="$out"
+  assert_success
+  [ -L "$out/install" ]
+  [ "$(readlink "$out/install")" = "$TEST_REPO/test/install" ]
+
+  # Anything else already at that path is left alone, and fails the build.
+  rm "$out/install"
+  mkdir "$out/install"
+  run make _test-install-output-link TESTOUT="$out"
+  assert_failure
+  echo "$output" | grep -q "exists and is not a symlink to $TEST_REPO/test/install"
+  [ -d "$out/install" ] && [ ! -L "$out/install" ]
 }
 
 @test "install schedule orders files by name, not filesystem/creation order (issue #111)" {

From 2ce457970a455507185336c8bfbb67871f6d99ee Mon Sep 17 00:00:00 2001
From: jnasbyupgrade <jnasby@upgrade.com>
Date: Wed, 14 Oct 2026 14:10:23 -0500
Subject: [PATCH 4/7] Fix a comment on where `test/install` actual output lands

It is always `$(TESTDIR)/install/`, per
Postgres-Extensions/pgxntool@3e8be3f.
---
 test/standard/make-test.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/standard/make-test.bats b/test/standard/make-test.bats
index d3aa3ef..ab3ed13 100755
--- a/test/standard/make-test.bats
+++ b/test/standard/make-test.bats
@@ -570,7 +570,7 @@ EOF
 
 @test "test and verify-results pass results/*.out and the test/install actual output to the TAP check" {
   # The template has test/install/create_install_marker.sql; its actual output
-  # is $(TESTOUT)/install/<name>.out (TESTOUT defaults to test).
+  # is $(TESTDIR)/install/<name>.out, whatever TESTOUT is.
   run make -n test
   assert_success
   assert_contains "$output" "test/bin/check-tap-output.sh test/results/*.out test/install/create_install_marker.out"

From 09cf607b86cf9e434f6837b59b874076bcdee1ac Mon Sep 17 00:00:00 2001
From: jnasbyupgrade <jnasby@upgrade.com>
Date: Wed, 14 Oct 2026 14:14:05 -0500
Subject: [PATCH 5/7] Test `PGXNTOOL_VERIFY_RESULTS_MODE=pgtap-only`

Add tests for Postgres-Extensions/pgxntool@15e558b (part of
https://github.com/Postgres-Extensions/pgxntool/pull/141, for
Postgres-Extensions/pgxntool#106):

- `verify-results-pgtap-script.bats`: under `--pgtap-only` (with and
  without `--for-test`), a TAP test whose only difference is its
  description passes, and fails under plain pgtap; a non-TAP diff
  still fails; a TAP test with a SQL error line fails.
- `check-tap-output-script.bats`: `--list` names only TAP files.
- `make-test.bats`: the mode validation tests cover `pgtap-only` and
  its parse-time error with `PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=no`, and
  a dry run shows `make test` and `verify-results` using the new
  logic.
---
 test/standard/check-tap-output-script.bats    |  8 +++
 test/standard/make-test.bats                  | 25 ++++++--
 .../standard/verify-results-pgtap-script.bats | 64 ++++++++++++++++++-
 3 files changed, 91 insertions(+), 6 deletions(-)

diff --git a/test/standard/check-tap-output-script.bats b/test/standard/check-tap-output-script.bats
index 1928c84..c6c45e6 100644
--- a/test/standard/check-tap-output-script.bats
+++ b/test/standard/check-tap-output-script.bats
@@ -67,6 +67,14 @@ not ok 2 - known issue # TODO fix later'
 
   run "$SCRIPT"
   assert_success
+
+  # --list names just the TAP files, by the same definition, and checks
+  # nothing: a failing TAP file is still listed with a zero exit.
+  write_out failing '1..1
+not ok 1'
+  run "$SCRIPT" --list "$OUTDIR/plain.out" "$OUTDIR/failing.out" "$OUTDIR/missing.out"
+  assert_success
+  [ "$output" = "$OUTDIR/failing.out" ]
 }
 
 @test "check-tap-output.sh: fails on a not ok without TODO" {
diff --git a/test/standard/make-test.bats b/test/standard/make-test.bats
index ab3ed13..a2aba33 100755
--- a/test/standard/make-test.bats
+++ b/test/standard/make-test.bats
@@ -20,7 +20,7 @@
 # - verify-results blocks `make results` when tests are failing, lets a
 #   brand-new test's first expected output through (issue #119), and can be
 #   disabled. Its own pass/fail logic lives in verify-results-pgtap-script.bats
-# - PGXNTOOL_VERIFY_RESULTS_MODE is validated (pgtap/diffs, case-insensitive)
+# - PGXNTOOL_VERIFY_RESULTS_MODE is validated (pgtap/pgtap-only/diffs, case-insensitive)
 
 load ../lib/helpers
 
@@ -579,6 +579,18 @@ EOF
   assert_success
   assert_contains "$output" "verify-results-pgtap.sh test test/install/create_install_marker.out"
 
+  # pgtap-only: verify-results-pgtap.sh, not a plain regression.diffs check,
+  # judges `make test`'s diffs, after the same TAP check.
+  run make -n test PGXNTOOL_VERIFY_RESULTS_MODE=pgtap-only
+  assert_success
+  assert_contains "$output" "test/bin/check-tap-output.sh test/results/*.out test/install/create_install_marker.out"
+  assert_contains "$output" "verify-results-pgtap.sh --pgtap-only --for-test test || status=1"
+  assert_not_contains "$output" "cat test/regression.diffs"
+
+  run make -n verify-results PGXNTOOL_VERIFY_RESULTS_MODE=pgtap-only
+  assert_success
+  assert_contains "$output" "verify-results-pgtap.sh --pgtap-only test test/install/create_install_marker.out"
+
   run make -n test PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=no
   assert_success
   assert_not_contains "$output" "check-tap-output.sh"
@@ -703,13 +715,13 @@ EOF
   assert_not_contains "$output" "Cannot run 'make results'"
 }
 
-@test "PGXNTOOL_VERIFY_RESULTS_MODE accepts pgtap/diffs case-insensitively" {
+@test "PGXNTOOL_VERIFY_RESULTS_MODE accepts pgtap/pgtap-only/diffs case-insensitively" {
   run make print-PGXNTOOL_VERIFY_RESULTS_MODE
   assert_success
   assert_contains "$output" 'set to "pgtap"'
 
   local value expected
-  for value in pgtap pgTap PGTAP diffs Diffs DIFFS; do
+  for value in pgtap pgTap PGTAP pgtap-only PgTap-Only diffs Diffs DIFFS; do
     expected=$(echo "$value" | tr '[:upper:]' '[:lower:]')
     run make print-PGXNTOOL_VERIFY_RESULTS_MODE "PGXNTOOL_VERIFY_RESULTS_MODE=$value"
     assert_success
@@ -722,8 +734,13 @@ EOF
   for value in bogus pgtapp "pgtap diffs" ""; do
     run make print-PGXNTOOL_VERIFY_RESULTS_MODE "PGXNTOOL_VERIFY_RESULTS_MODE=$value"
     assert_failure
-    assert_contains "$output" "PGXNTOOL_VERIFY_RESULTS_MODE must be one of: pgtap diffs; got \"$value\""
+    assert_contains "$output" "PGXNTOOL_VERIFY_RESULTS_MODE must be one of: pgtap pgtap-only diffs; got \"$value\""
   done
+
+  # pgtap-only without the TAP check would pass TAP tests on nothing.
+  run make print-PGXNTOOL_VERIFY_RESULTS_MODE PGXNTOOL_VERIFY_RESULTS_MODE=pgtap-only PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=NO
+  assert_failure
+  assert_contains "$output" "PGXNTOOL_VERIFY_RESULTS_MODE=pgtap-only requires PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=yes"
 }
 
 @test "mixed-case PGXNTOOL_VERIFY_RESULTS_MODE selects the matching verify-results recipe" {
diff --git a/test/standard/verify-results-pgtap-script.bats b/test/standard/verify-results-pgtap-script.bats
index 7f19e4b..0d69d4f 100644
--- a/test/standard/verify-results-pgtap-script.bats
+++ b/test/standard/verify-results-pgtap-script.bats
@@ -8,8 +8,10 @@
 # entries block `make results` (a real mismatch against an existing baseline)
 # versus which are a brand-new test that has no expected output yet (issue
 # #119), and that its TAP phase hands results/*.out plus any extra file
-# arguments to check-tap-output.sh. Which TAP output fails is that script's
-# logic, covered in check-tap-output-script.bats.
+# arguments to check-tap-output.sh. Also which blocks --pgtap-only drops (TAP
+# tests without a SQL error), for `make results` and, with --for-test, for
+# `make test`. Which TAP output fails is that script's logic, covered in
+# check-tap-output-script.bats.
 #
 # Tests that need real Make/PostgreSQL integration stay in make-test.bats:
 # that `make verify-results` invokes this script and propagates its exit
@@ -349,6 +351,64 @@ ok 1'
   assert_contains "$output" "Cannot run 'make results'"
 }
 
+# --pgtap-only (PGXNTOOL_VERIFY_RESULTS_MODE=pgtap-only); --for-test is how
+# the `make test` recipe calls it.
+
+@test "verify-results-pgtap.sh: --pgtap-only ignores a TAP test's description-only diff" {
+  write_results described '1..1
+ok 1 - grants role_x_build42'
+  append_diff_block described '@@ -1,2 +1,2 @@
+ 1..1
+-ok 1 - grants role_x
++ok 1 - grants role_x_build42'
+
+  run "$SCRIPT" "$TESTOUT"
+  assert_failure_with_status 1
+  assert_contains "$output" "Tests are failing"
+
+  local args
+  for args in --pgtap-only "--pgtap-only --for-test"; do
+    run "$SCRIPT" $args "$TESTOUT"
+    assert_success
+    assert_contains "$output" "NOTE: pgtap-only mode ignored regression.diffs differences in TAP tests: described"
+  done
+}
+
+@test "verify-results-pgtap.sh: --pgtap-only still fails a non-TAP test's diff" {
+  write_results plain ' x
+---
+ 2'
+  append_diff_block plain '@@ -1,3 +1,3 @@
+  x
+ ---
+- 1
++ 2'
+
+  run "$SCRIPT" --pgtap-only "$TESTOUT"
+  assert_failure_with_status 1
+  assert_contains "$output" "Cannot run 'make results'"
+  assert_contains "$output" "plain.out"
+
+  run "$SCRIPT" --pgtap-only --for-test "$TESTOUT"
+  assert_failure_with_status 1
+  assert_not_contains "$output" "make results"
+  assert_contains "$output" "+ 2"
+}
+
+@test "verify-results-pgtap.sh: --pgtap-only fails a TAP test with a SQL error line, diff or not" {
+  write_results errored '1..1
+ok 1
+psql:test/pgxntool/finish.sql:2: ERROR:  boom'
+
+  local args
+  for args in --pgtap-only "--pgtap-only --for-test"; do
+    run "$SCRIPT" $args "$TESTOUT"
+    assert_failure_with_status 1
+    assert_contains "$output" "ERROR: SQL errors in pgtap test output"
+    assert_contains "$output" "$TESTOUT/results/errored.out"
+  done
+}
+
 @test "verify-results-pgtap.sh: usage error when called with no TESTOUT argument" {
   run "$SCRIPT"
   assert_failure

From 9e63c06a5cb7b64278cdc0fa2049a84ec6844ec3 Mon Sep 17 00:00:00 2001
From: jnasbyupgrade <jnasby@upgrade.com>
Date: Thu, 15 Oct 2026 16:45:41 -0500
Subject: [PATCH 6/7] Follow the removal of `PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT`

Update tests for Postgres-Extensions/pgxntool@7eec927 (part of
https://github.com/Postgres-Extensions/pgxntool/pull/141, for
Postgres-Extensions/pgxntool#106):

- `make-test.bats`: the dry-run and stub tests prove
  `PGXNTOOL_VERIFY_RESULTS_MODE=diffs` skips the TAP check, instead of
  the removed variable; drop its invalid-value test and the
  `pgtap-only` conflict assertion.
- `pgxntool-variables.txt`: drop the variable from the inventory.
---
 test/lib/pgxntool-variables.txt            |  1 -
 test/standard/check-tap-output-script.bats |  2 +-
 test/standard/make-test.bats               | 22 ++++++----------------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/test/lib/pgxntool-variables.txt b/test/lib/pgxntool-variables.txt
index ef50d91..86539ea 100644
--- a/test/lib/pgxntool-variables.txt
+++ b/test/lib/pgxntool-variables.txt
@@ -36,7 +36,6 @@ legacy   PGVERSION
 api      PGXNTOOL_CHECK_EXPECTED_FILE_TYPES
 legacy   PGXNTOOL_DIR
 api      PGXNTOOL_ENABLE_CHECK_STALE_EXPECTED
-api      PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT
 api      PGXNTOOL_ENABLE_FS_INSTALL
 api      PGXNTOOL_ENABLE_PGXN_INSTALL
 api      PGXNTOOL_ENABLE_TEST_BUILD
diff --git a/test/standard/check-tap-output-script.bats b/test/standard/check-tap-output-script.bats
index c6c45e6..a32f499 100644
--- a/test/standard/check-tap-output-script.bats
+++ b/test/standard/check-tap-output-script.bats
@@ -7,7 +7,7 @@
 # decision logic: what counts as TAP output, and which TAP output fails.
 #
 # make-test.bats covers only base.mk's wiring (which files `make test` passes
-# in, the PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=no skip, exit-status propagation)
+# in, the PGXNTOOL_VERIFY_RESULTS_MODE=diffs skip, exit-status propagation)
 # plus one real end-to-end failure; verify-results-pgtap-script.bats covers
 # verify-results-pgtap.sh's use of this script.
 
diff --git a/test/standard/make-test.bats b/test/standard/make-test.bats
index a2aba33..a42379b 100755
--- a/test/standard/make-test.bats
+++ b/test/standard/make-test.bats
@@ -563,7 +563,7 @@ EOF
 #
 # Which TAP output fails is check-tap-output.sh's own logic, covered in
 # check-tap-output-script.bats. These cover base.mk's wiring only: the files
-# the recipe passes in, the PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=no skip, and that
+# the recipe passes in, the PGXNTOOL_VERIFY_RESULTS_MODE=diffs skip, and that
 # the script's exit status decides `make test`. The one real end-to-end case
 # (a blessed `not ok`) is in the verify-results section below, since seeding it
 # needs `make results`.
@@ -591,18 +591,13 @@ EOF
   assert_success
   assert_contains "$output" "verify-results-pgtap.sh --pgtap-only test test/install/create_install_marker.out"
 
-  run make -n test PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=no
+  run make -n test PGXNTOOL_VERIFY_RESULTS_MODE=diffs
   assert_success
   assert_not_contains "$output" "check-tap-output.sh"
+  assert_contains "$output" "cat test/regression.diffs"
 }
 
-@test "PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT rejects invalid values" {
-  run make -n test PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=maybe
-  assert_failure
-  assert_contains "$output" "PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT"
-}
-
-@test "make test runs the TAP check stub, takes its exit status, and skips it when disabled" {
+@test "make test runs the TAP check stub, takes its exit status, and skips it in diffs mode" {
   skip_if_no_postgres
 
   local marker="$BATS_TEST_TMPDIR/check-tap-output-invoked"
@@ -618,10 +613,10 @@ EOF
   assert_success
   assert_file_exists "$marker"
 
-  # Disabled: never invoked at all, not merely tolerated.
+  # diffs mode: never invoked at all, not merely tolerated.
   rm -f "$marker"
   stub_script=$(make_stub_script disabled-stub 1 "" "$marker")
-  run make test PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=no _PGXNTOOL_CHECK_TAP_OUTPUT_SCRIPT="$stub_script"
+  run make test PGXNTOOL_VERIFY_RESULTS_MODE=diffs _PGXNTOOL_CHECK_TAP_OUTPUT_SCRIPT="$stub_script"
   assert_success
   assert_file_not_exists "$marker"
 }
@@ -736,11 +731,6 @@ EOF
     assert_failure
     assert_contains "$output" "PGXNTOOL_VERIFY_RESULTS_MODE must be one of: pgtap pgtap-only diffs; got \"$value\""
   done
-
-  # pgtap-only without the TAP check would pass TAP tests on nothing.
-  run make print-PGXNTOOL_VERIFY_RESULTS_MODE PGXNTOOL_VERIFY_RESULTS_MODE=pgtap-only PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=NO
-  assert_failure
-  assert_contains "$output" "PGXNTOOL_VERIFY_RESULTS_MODE=pgtap-only requires PGXNTOOL_ENABLE_CHECK_TAP_OUTPUT=yes"
 }
 
 @test "mixed-case PGXNTOOL_VERIFY_RESULTS_MODE selects the matching verify-results recipe" {

From 2e0615a37b6b9390a9f8398a0de3684515002512 Mon Sep 17 00:00:00 2001
From: jnasbyupgrade <jnasby@upgrade.com>
Date: Fri, 16 Oct 2026 16:16:25 -0500
Subject: [PATCH 7/7] Refer to the pgxntool issue by its full name in
 make-test.bats

A bare #106 in pgxntool-test resolves to this repo's PR, so the
reference now names Postgres-Extensions/pgxntool#106.
---
 test/standard/make-test.bats | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/standard/make-test.bats b/test/standard/make-test.bats
index a42379b..17dc9e1 100755
--- a/test/standard/make-test.bats
+++ b/test/standard/make-test.bats
@@ -559,7 +559,7 @@ EOF
   assert_success
 }
 
-# Test: TAP output check in the `test` recipe (issue #106)
+# Test: TAP output check in the `test` recipe (Postgres-Extensions/pgxntool#106)
 #
 # Which TAP output fails is check-tap-output.sh's own logic, covered in
 # check-tap-output-script.bats. These cover base.mk's wiring only: the files
@@ -795,7 +795,7 @@ EOF
   rm -f test/sql/brand_new.sql test/expected/brand_new.out test/results/brand_new.out
 }
 
-@test "make test fails on a not ok that was blessed into expected output (issue #106)" {
+@test "make test fails on a not ok that was blessed into expected output (Postgres-Extensions/pgxntool#106)" {
   skip_if_no_postgres
 
   # Actual output matches expected byte for byte, so regression.diffs stays