Revert "Stabilize output of new regression test case".

tglsfdc · tglsfdc · commit cbadba8dd632 · 2018-02-14T18:42:14.000-05:00
This effectively reverts commit 9edc97b (although the test is now in a different place and has different contents). We don't need that hack anymore, because since commit 4b93f57, 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
@@ -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
@@ -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
 
