mirrors/pv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust the installer test to retry with both "gmake" and "make", to work around strange behaviour on NetBSD.

Browse Source
This commit is contained in:
Andrew Wood
2025-01-28 22:10:49 +00:00
parent a62051e5ff
commit 3f597e59e0
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Bug_-_Install_all_files.test
+14 -2
View File
@@ -29,8 +29,20 @@ if ! test -n "${testInstallDir}"; then
fi
export DESTDIR="${testInstallDir}"
if ! ${makeCommand} -C "${makeDir}" install DESTDIR="${testInstallDir}" >"${workFile1}" 2>&1; then
echo "\`make install' exited $?"
${makeCommand} -C "${makeDir}" install DESTDIR="${testInstallDir}" >"${workFile1}" 2>&1
rc=$?
if ! test "${rc}" -eq 0; then
if ! test "${makeCommand}" = "make"; then
# Retry with plain "make".
makeCommand="make"
${makeCommand} -C "${makeDir}" install DESTDIR="${testInstallDir}" >>"${workFile1}" 2>&1
rc=$?
fi
fi
if ! test ${rc} -eq 0; then
echo "\`make install' exited ${rc}"
echo "command: ${makeCommand} -C '${makeDir}' install DESTDIR='${testInstallDir}'"
cat "${workFile1}"
rm -rf "${testInstallDir}"
exit 1
fi