summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2011-04-04 12:01:43 +0300
committerPanu Matilainen <pmatilai@redhat.com>2011-04-04 12:01:43 +0300
commit086791164a31c3533b1dc4f145e87a7f7e81ca09 (patch)
treec1b766b5474aaaa1282c0a584bf577a6527d30ed /tests
parent72b21d5ffc86b0091af93a5c3aaa378da3fb8f6b (diff)
downloadrpm-086791164a31c3533b1dc4f145e87a7f7e81ca09.tar.gz
rpm-086791164a31c3533b1dc4f145e87a7f7e81ca09.tar.bz2
rpm-086791164a31c3533b1dc4f145e87a7f7e81ca09.zip
Prepare the test root entirely from Makefile, add missing bits
- Running builds in fakechroot needs a whole lot of things.. add symlinks to various system config + dev files to give some trivial packages a chance to build under fakechroot
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am5
-rw-r--r--tests/atlocal.in3
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 625573286..f6e95103f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -86,7 +86,10 @@ testing$(bindir)/rpmbuild: ../rpmbuild
(cd ${top_builddir} && \
$(MAKE) DESTDIR=`pwd`/${subdir}/testing install)
cp -r data/ testing/
- for prog in gzip cat patch tar sh chmod; do p=`which $${prog}`; ln -s $${p} testing/$${p}; done
+ mkdir testing/{dev,etc}
+ for node in stdin stderr stdout null; do ln -s /dev/$${node} testing/dev/$${node}; done
+ for cf in hosts resolv.conf passwd shadow group gshadow mtab fstab; do [ -f /etc/$${cf} ] && ln -s /etc/$${cf} testing/etc/$${cf}; done
+ for prog in gzip cat patch tar sh chmod rm mkdir; do p=`which $${prog}`; ln -s $${p} testing/$${p}; done
check_DATA = atconfig atlocal $(TESTSUITE)
check_DATA += testing$(bindir)/rpmbuild
diff --git a/tests/atlocal.in b/tests/atlocal.in
index fecd950c1..3d46a7d4b 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -30,7 +30,6 @@ function run()
function runroot()
{
(cd ${RPMTEST} && \
- mkdir -p etc && touch etc/mtab &&
- FAKECHROOT_BASE="${RPMTEST}" fakechroot "$@" --define "_topdir ${TOPDIR}"
+ FAKECHROOT_BASE="${RPMTEST}" fakechroot "$@" --define "_topdir /build"
)
}