From e8079fed514cc4c59abf13d5c82dedb614cbb1c8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 3 Jun 2020 19:27:55 +0100
Subject: [PATCH] tests: Cope with newer versions of GNU make

The file descriptor pointing to the jobserver is not passed through
the test script, so passing through a MAKEFLAGS environment variable
that refers to it is just going to confuse us.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 tests/gl-shim.pl      | 1 +
 tests/init-project.pl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/gl-shim.pl b/tests/gl-shim.pl
index 2c33983f2..3ff45e451 100755
--- a/tests/gl-shim.pl
+++ b/tests/gl-shim.pl
@@ -43,6 +43,7 @@ if (length $ENV{CAPSULE_TESTS_UNINSTALLED}) {
     # Make sure the shim can load the just-built libcapsule
     push @libcapsule_environment, "LD_LIBRARY_PATH=$ENV{G_TEST_BUILDDIR}/.libs";
 }
+delete $ENV{MAKEFLAGS};
 
 my $examples = "$srcdir/examples";
 
diff --git a/tests/init-project.pl b/tests/init-project.pl
index 9d4ad448a..3bca8297a 100755
--- a/tests/init-project.pl
+++ b/tests/init-project.pl
@@ -43,6 +43,7 @@ if (length $ENV{CAPSULE_TESTS_UNINSTALLED}) {
     # Make sure the shim can load the just-built libcapsule
     push @libcapsule_environment, "LD_LIBRARY_PATH=$ENV{G_TEST_BUILDDIR}/.libs";
 }
+delete $ENV{MAKEFLAGS};
 
 my @configure_arguments = ();
 
-- 
GitLab