From 92155e15d3cfe97758552484acb1583aaf71cda6 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 15 May 2023 07:07:09 +0200 Subject: Fix incorrect TAP test ordering Using a test function before a possible skip_all is incorrect. If the skip_all is called, the test output will become incorrect and the test file will fail. a4f23f9b3c introduced a new test before skip_all. After discussion, this doesn't really need to be a test. Instead, we just bail out if the condition is not satisfied. Discussion: https://www.postgresql.org/message-id/af5567a1-aea6-fbdb-7e4b-d1e23a43c43b@enterprisedb.com --- src/bin/pg_amcheck/t/004_verify_heapam.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/pg_amcheck/t/004_verify_heapam.pl b/src/bin/pg_amcheck/t/004_verify_heapam.pl index e77b50c6c5..aa62422316 100644 --- a/src/bin/pg_amcheck/t/004_verify_heapam.pl +++ b/src/bin/pg_amcheck/t/004_verify_heapam.pl @@ -340,7 +340,7 @@ my @lp_off = split '\n', $node->safe_psql( FROM heap_page_items(get_raw_page('test', 'main', 0)) ) ); -is(scalar @lp_off, $ROWCOUNT, "acquired row offsets"); +scalar @lp_off == $ROWCOUNT or BAIL_OUT("row offset counts mismatch"); # Sanity check that our 'test' table on disk layout matches expectations. If # this is not so, we will have to skip the test until somebody updates the test -- cgit v1.2.1