aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2012-12-01 17:24:01 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2012-12-01 17:24:01 -0500
commit647b1bcdfd26f786248366e4fb25c0fd62006329 (patch)
tree38cbb9a92fab5c36b804cc50339a28902f1afb28 /src
parent04f91ae5d0caa5faae7100eac3b0ade6f84e1e9e (diff)
downloadpostgresql-647b1bcdfd26f786248366e4fb25c0fd62006329.tar.gz
postgresql-647b1bcdfd26f786248366e4fb25c0fd62006329.zip
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 c8b45c93f20..502299a52e2 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -792,6 +792,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));