summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2012-12-01 17:24:05 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2012-12-01 17:24:05 -0500
commitdbf2e2639067d95f507b727989454a74981fbc31 (patch)
treef43f53ff5082590b2eb1653da0258ba86bea7cad /src
parent4ef41598171b93be06e2f46d4301ae173da62f34 (diff)
Prevent passing gmake's environment variables down through pg_regress.
When we do "make install" to create a temp installation, we don't want that instance of make to try to communicate with any instance of make that might be calling us. This is known to cause problems if the upper make has a -jN flag, and in principle could cause problems even without that. Unset the relevant environment variables to prevent such issues. Andres Freund
Diffstat (limited to 'src')
-rw-r--r--src/test/regress/pg_regress.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 0aa2ae7f87f..43edf1ea4b7 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -787,6 +787,19 @@ initialize_environment(void)
}
/*
+ * GNU make stores some flags in the MAKEFLAGS environment variable to
+ * pass arguments to its own children. If we are invoked by make,
+ * that causes the make invoked by us to think its part of the make
+ * task invoking us, and so it tries to communicate with the toplevel
+ * make. Which fails.
+ *
+ * Unset the variable to protect against such problems. We also reset
+ * MAKELEVEL to be certain the child doesn't notice the make above us.
+ */
+ unsetenv("MAKEFLAGS");
+ unsetenv("MAKELEVEL");
+
+ /*
* Adjust path variables to point into the temp-install tree
*/
tmp = malloc(strlen(temp_install) + 32 + strlen(bindir));