rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Use make_build macro when running tests

Browse Source 
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.
This commit is contained in:
Tom Stellard 2020-01-14 23:34:53 +00:00
parent 79d00e3416
commit d34bc424d9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git.spec
View File

@ -93,7 +93,7 @@
Name: git Name: git
Version: 2.25.0 Version: 2.25.0
Release: 1%{?rcrev}%{?dist} Release: 2%{?rcrev}%{?dist}
Summary: Fast Version Control System Summary: Fast Version Control System
License: GPLv2 License: GPLv2
URL: https://git-scm.com/ 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 touch -r ts GIT-BUILD-OPTIONS
# Run the tests # Run the tests
make test || ./print-failed-test-output %make_build test || ./print-failed-test-output
# Run contrib/credential/netrc tests # Run contrib/credential/netrc tests
mkdir -p contrib/credential mkdir -p contrib/credential
mv netrc contrib/credential/ mv netrc contrib/credential/
make -C contrib/credential/netrc/ test || \ %make_build -C contrib/credential/netrc/ test || \
make -C contrib/credential/netrc/ testverbose %make_build -C contrib/credential/netrc/ testverbose
# Clean up test dir # Clean up test dir
rmdir --ignore-fail-on-non-empty "$testdir" rmdir --ignore-fail-on-non-empty "$testdir"
@ -1027,6 +1027,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html} %{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog %changelog
* Tue Jan 14 2020 Tom Stellard <tstellar@redhat.com> - 2.25.0-2
- Use make_build macro when running tests
* Tue Jan 14 2020 Todd Zullinger <tmz@pobox.com> - 2.25.0-1 * Tue Jan 14 2020 Todd Zullinger <tmz@pobox.com> - 2.25.0-1
- update to 2.25.0 - update to 2.25.0