From: Michael Paquier <michael@paquier.xyz>
Date: Sat, 9 Nov 2019 06:41:34 +0000 (+0900)
Subject: Fix new COPY test of PL/pgSQL with VPATH builds
X-Git-Url: http://git.postgresql.org/gitweb/-?a=commitdiff_plain;h=943b447d303e6d0a7635d39ac552550b77b96cef;p=users%2Frhaas%2Fpostgres.git

Fix new COPY test of PL/pgSQL with VPATH builds

The buildfarm has turned red after 1858b10 because VPATH builds need to
use "@abs_srcdir@" and not "@abs_builddir@" for paths coming directly
from the source tree.  The input file of the new test got that right,
but not the output file.

Per complaints from several buildfarm animals, including desmoxytes and
culicidae.  I have also reproduced the error by myself.
---

diff --git a/src/pl/plpgsql/src/output/plpgsql_copy.source b/src/pl/plpgsql/src/output/plpgsql_copy.source
index 78c9a75180..86e833d055 100644
--- a/src/pl/plpgsql/src/output/plpgsql_copy.source
+++ b/src/pl/plpgsql/src/output/plpgsql_copy.source
@@ -32,7 +32,7 @@ CONTEXT:  PL/pgSQL function inline_code_block line 3 at EXECUTE
 -- COPY FROM
 DO LANGUAGE plpgsql $$
 BEGIN
-  COPY copy1 FROM '@abs_builddir@/data/copy1.data';
+  COPY copy1 FROM '@abs_srcdir@/data/copy1.data';
 END;
 $$;
 SELECT * FROM copy1 ORDER BY 1;
@@ -46,7 +46,7 @@ SELECT * FROM copy1 ORDER BY 1;
 TRUNCATE copy1;
 DO LANGUAGE plpgsql $$
 BEGIN
-  EXECUTE 'COPY copy1 FROM ''@abs_builddir@/data/copy1.data''';
+  EXECUTE 'COPY copy1 FROM ''@abs_srcdir@/data/copy1.data''';
 END;
 $$;
 SELECT * FROM copy1 ORDER BY 1;