Revert "Stabilize output of new regression test case".

This effectively reverts commit 9edc97b71 (although the test is now
in a different place and has different contents).  We don't need that
hack anymore, because since commit 4b93f5799, this test case no longer
throws an error and so there's no displayed CONTEXT that could vary
depending on CLOBBER_CACHE_ALWAYS.  The underlying unstable-output
problem isn't really gone, of course, but it no longer manifests here.

diff --git a/src/pl/plpgsql/src/expected/plpgsql_varprops.out b/src/pl/plpgsql/src/expected/plpgsql_varprops.out
index 109056c0540985ddfc497db063ea3fe6b8c0782d..18f03d75b4268f5910655cd26da138249ded4e36 100644 (file)
--- a/src/pl/plpgsql/src/expected/plpgsql_varprops.out
+++ b/src/pl/plpgsql/src/expected/plpgsql_varprops.out
@@ -176,7 +176,6 @@ end$$;
 ERROR:  null value cannot be assigned to variable "x" declared NOT NULL
 CONTEXT:  PL/pgSQL function inline_code_block line 3 during statement block local variable initialization
 -- Check that variables are reinitialized on block re-entry.
-\set VERBOSITY terse   \\ -- needed for output stability
 do $$
 begin
   for i in 1..3 loop
@@ -210,7 +209,6 @@ NOTICE:  x = <NULL>
 NOTICE:  y = 3
 NOTICE:  r = <NULL>
 NOTICE:  c = <NULL>
-\set VERBOSITY default
 -- Check enforcement of domain constraints during initialization
 do $$
 declare x int_nn;  -- fail

diff --git a/src/pl/plpgsql/src/sql/plpgsql_varprops.sql b/src/pl/plpgsql/src/sql/plpgsql_varprops.sql
index c0e7f95f4e2b1fcd44edd7ae69d2dddb85d002a1..778119d223babe7937b2a5560a7cf5814d93de0e 100644 (file)
--- a/src/pl/plpgsql/src/sql/plpgsql_varprops.sql
+++ b/src/pl/plpgsql/src/sql/plpgsql_varprops.sql
@@ -151,7 +151,6 @@ end$$;
 
 -- Check that variables are reinitialized on block re-entry.
 
-\set VERBOSITY terse   \\ -- needed for output stability
 do $$
 begin
   for i in 1..3 loop
@@ -173,7 +172,6 @@ begin
     end;
   end loop;
 end$$;
-\set VERBOSITY default
 
 -- Check enforcement of domain constraints during initialization