Prevent passing gmake's environment variables down through pg_regress.

tglsfdc · tglsfdc · commit dbf2e2639067 · 2012-12-01T17:24:05.000-05:00
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
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
@@ -786,6 +786,19 @@ initialize_environment(void)
 			doputenv("PGPORT", s);
 		}
 
+		/*
+		 * 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
 		 */
