Skip to content
Snippets Groups Projects
Commit e8079fed authored by Simon McVittie's avatar Simon McVittie
Browse files

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: default avatarSimon McVittie <smcv@collabora.com>
parent 31ec0649
No related branches found
No related tags found
1 merge request!311Build capsule-capture-libs from a bundled copy of libcapsule
...@@ -43,6 +43,7 @@ if (length $ENV{CAPSULE_TESTS_UNINSTALLED}) { ...@@ -43,6 +43,7 @@ if (length $ENV{CAPSULE_TESTS_UNINSTALLED}) {
# Make sure the shim can load the just-built libcapsule # Make sure the shim can load the just-built libcapsule
push @libcapsule_environment, "LD_LIBRARY_PATH=$ENV{G_TEST_BUILDDIR}/.libs"; push @libcapsule_environment, "LD_LIBRARY_PATH=$ENV{G_TEST_BUILDDIR}/.libs";
} }
delete $ENV{MAKEFLAGS};
my $examples = "$srcdir/examples"; my $examples = "$srcdir/examples";
......
...@@ -43,6 +43,7 @@ if (length $ENV{CAPSULE_TESTS_UNINSTALLED}) { ...@@ -43,6 +43,7 @@ if (length $ENV{CAPSULE_TESTS_UNINSTALLED}) {
# Make sure the shim can load the just-built libcapsule # Make sure the shim can load the just-built libcapsule
push @libcapsule_environment, "LD_LIBRARY_PATH=$ENV{G_TEST_BUILDDIR}/.libs"; push @libcapsule_environment, "LD_LIBRARY_PATH=$ENV{G_TEST_BUILDDIR}/.libs";
} }
delete $ENV{MAKEFLAGS};
my @configure_arguments = (); my @configure_arguments = ();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment