[Libguestfs] [PATCH 5/7] php: pass $(MAKE) to run-php-tests.sh

Instead of hardcoding "make" in run-php-tests.sh, pass the actual name of make from the Makefile; the default is still "make", mostly to use the script without having to set $MAKE. --- php/Makefile.am | 4 +++- php/run-php-tests.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/php/Makefile.am b/php/Makefile.am index 836f4ba..4db7d84 100644 --- a/php/Makefile.am +++ b/php/Makefile.am @@ -60,7 +60,9 @@ extension/config.h: extension/config.m4 ../config.status test -f "$@" && touch -- $@ # Don't use --test because PHP always returns a success code. -TESTS_ENVIRONMENT = $(top_builddir)/run +TESTS_ENVIRONMENT = \ + MAKE=$(MAKE) \ + $(top_builddir)/run TESTS = run-php-tests.sh diff --git a/php/run-php-tests.sh b/php/run-php-tests.sh index 4132927..e5cfc0d 100755 --- a/php/run-php-tests.sh +++ b/php/run-php-tests.sh @@ -44,4 +44,4 @@ printenv | grep -E '^(LIBGUESTFS|LIBVIRT|LIBVIRTD|VIRTLOCKD|LD|MALLOC)_' >> env TESTS=$(echo tests/guestfs_*.phpt) echo TESTS: $TESTS -make test TESTS="$TESTS" PHP_EXECUTABLE="$PWD/php-for-tests.sh" REPORT_EXIT_STATUS=1 TEST_TIMEOUT=300 +${MAKE:-make} test TESTS="$TESTS" PHP_EXECUTABLE="$PWD/php-for-tests.sh" REPORT_EXIT_STATUS=1 TEST_TIMEOUT=300 -- 2.5.0