Commit 9edc97b7 authored by Tom Lane's avatar Tom Lane

Stabilize output of new regression test case.

The test added by commit 390d5813 turns out to have different output
in CLOBBER_CACHE_ALWAYS builds: there's an extra CONTEXT line in the
error message as a result of detecting the error at a different place.
Possibly we should do something to make that more consistent.  But as
a stopgap measure to make the buildfarm green again, adjust the test
to suppress CONTEXT entirely.  We can revert this if we do something
in the backend to eliminate the inconsistency.

Discussion: https://postgr.es/m/31545.1512924904@sss.pgh.pa.us
parent 390d5813
...@@ -5026,6 +5026,7 @@ select scope_test(); ...@@ -5026,6 +5026,7 @@ select scope_test();
drop function scope_test(); drop function scope_test();
-- Check that variables are reinitialized on block re-entry. -- Check that variables are reinitialized on block re-entry.
\set VERBOSITY terse \\ -- needed for output stability
do $$ do $$
begin begin
for i in 1..3 loop for i in 1..3 loop
...@@ -5050,8 +5051,7 @@ NOTICE: r = (1,2) ...@@ -5050,8 +5051,7 @@ NOTICE: r = (1,2)
NOTICE: x = <NULL> NOTICE: x = <NULL>
NOTICE: y = 2 NOTICE: y = 2
ERROR: record "r" is not assigned yet ERROR: record "r" is not assigned yet
DETAIL: The tuple structure of a not-yet-assigned record is indeterminate. \set VERBOSITY default
CONTEXT: PL/pgSQL function inline_code_block line 15 at RAISE
-- Check handling of conflicts between plpgsql vars and table columns. -- Check handling of conflicts between plpgsql vars and table columns.
set plpgsql.variable_conflict = error; set plpgsql.variable_conflict = error;
create function conflict_test() returns setof int8_tbl as $$ create function conflict_test() returns setof int8_tbl as $$
......
...@@ -4016,6 +4016,7 @@ drop function scope_test(); ...@@ -4016,6 +4016,7 @@ drop function scope_test();
-- Check that variables are reinitialized on block re-entry. -- Check that variables are reinitialized on block re-entry.
\set VERBOSITY terse \\ -- needed for output stability
do $$ do $$
begin begin
for i in 1..3 loop for i in 1..3 loop
...@@ -4034,6 +4035,7 @@ begin ...@@ -4034,6 +4035,7 @@ begin
end; end;
end loop; end loop;
end$$; end$$;
\set VERBOSITY default
-- Check handling of conflicts between plpgsql vars and table columns. -- Check handling of conflicts between plpgsql vars and table columns.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment