46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From b7606b9dbebba90fb4868fd01e9c05abe05d9586 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <b7606b9dbebba90fb4868fd01e9c05abe05d9586.1559904592.git.pmatilai@redhat.com>
|
|
From: Panu Matilainen <pmatilai@redhat.com>
|
|
Date: Fri, 7 Jun 2019 13:12:18 +0300
|
|
Subject: [PATCH] Use a pre-determined buildhost in test-suite to avoid DNS
|
|
usage
|
|
|
|
A misconfigured DNS can cause bogus test-suite failures and hideous
|
|
slow-down for no reason of our own. Use a preset, predictable
|
|
buildhost name to avoid such issues.
|
|
---
|
|
tests/atlocal.in | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tests/atlocal.in b/tests/atlocal.in
|
|
index a44c067bf..fcbf783d7 100644
|
|
--- a/tests/atlocal.in
|
|
+++ b/tests/atlocal.in
|
|
@@ -45,20 +45,20 @@ fi
|
|
|
|
function run()
|
|
{
|
|
- "$@" --define "_tmppath ${RPMTEST}/tmp" --define "_topdir ${TOPDIR}" --dbpath="${RPMTEST}/var/lib/rpm/"
|
|
+ "$@" --define "_buildhost testhost" --define "_tmppath ${RPMTEST}/tmp" --define "_topdir ${TOPDIR}" --dbpath="${RPMTEST}/var/lib/rpm/"
|
|
}
|
|
|
|
function rundebug()
|
|
{
|
|
cp ${top_srcdir}/macros.debug ${RPM_CONFIGDIR}/macros.d/
|
|
- "$@" --define "_tmppath ${RPMTEST}/tmp" --define "_topdir ${TOPDIR}" --dbpath="${RPMTEST}/var/lib/rpm/"
|
|
+ "$@" --define "_buildhost testhost" --define "_tmppath ${RPMTEST}/tmp" --define "_topdir ${TOPDIR}" --dbpath="${RPMTEST}/var/lib/rpm/"
|
|
rm -f ${RPM_CONFIGDIR}/macros.d/macros.debug
|
|
}
|
|
|
|
function runroot()
|
|
{
|
|
(unset RPM_CONFIGDIR RPM_POPTEXEC_PATH; cd ${RPMTEST} && \
|
|
- MAGIC="/magic/magic" FAKECHROOT_BASE="${RPMTEST}" fakechroot "$@" --define "_topdir /build" --noplugins
|
|
+ MAGIC="/magic/magic" FAKECHROOT_BASE="${RPMTEST}" fakechroot "$@" --define "_buildhost testhost" --define "_topdir /build" --noplugins
|
|
)
|
|
}
|
|
|
|
--
|
|
2.21.0
|
|
|