From d34bc424d9cdce6b503193f0438ea70d2dd62f09 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jan 2020 23:34:53 +0000 Subject: [PATCH] Use make_build macro when running tests This will make it possible for buildroots to inject arguments to make by redefining the %__make macro. For example, the test target uses gcc to compile fuzz-commit-graph.c, so one thing this change will allow us to do is to pass CC=clang to make if we want to try to build with clang. --- git.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 8b68b98..c44782f 100644 --- a/git.spec +++ b/git.spec @@ -93,7 +93,7 @@ Name: git Version: 2.25.0 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -863,13 +863,13 @@ sed -i "s@\(GIT_TEST_OPTS='.*\)'@\1 --root=$testdir'@" GIT-BUILD-OPTIONS touch -r ts GIT-BUILD-OPTIONS # Run the tests -make test || ./print-failed-test-output +%make_build test || ./print-failed-test-output # Run contrib/credential/netrc tests mkdir -p contrib/credential mv netrc contrib/credential/ -make -C contrib/credential/netrc/ test || \ -make -C contrib/credential/netrc/ testverbose +%make_build -C contrib/credential/netrc/ test || \ +%make_build -C contrib/credential/netrc/ testverbose # Clean up test dir rmdir --ignore-fail-on-non-empty "$testdir" @@ -1027,6 +1027,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Tue Jan 14 2020 Tom Stellard - 2.25.0-2 +- Use make_build macro when running tests + * Tue Jan 14 2020 Todd Zullinger - 2.25.0-1 - update to 2.25.0