commit: 317a31dfc1519d8baa10bca736f719faa83692b8
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 10:05:12 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 10:05:12 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=317a31df
tests/qmerge: drop restriction on Gentoo system
define VDB path such that qmerge tests can run successfully anywhere,
most notably by Travis, so we don't silently get breakage
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
tests/qmerge/dotest | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/tests/qmerge/dotest b/tests/qmerge/dotest
index 57e2940..17187f9 100755
--- a/tests/qmerge/dotest
+++ b/tests/qmerge/dotest
@@ -1,11 +1,5 @@
#!/bin/bash
-# TODO: Make these work with local vdb instead of requiring /.
-if [[ -n ${TRAVIS_OS_NAME} ]] ; then
- echo "TODO: Make it work on non-Gentoo system"
- exit 0
-fi
-
. ../init.sh || exit 1
set -e
@@ -14,14 +8,11 @@ export QMERGE=1
export PKGDIR=${as}/packages
export FEATURES='config-protect-if-modified'
-if [[ ! -e ${PKGDIR}/Packages ]] ; then
- emaint binhost -f
-fi
-
mktmpdir
export ROOT=${PWD}/root
export PORTAGE_TMPDIR=${PWD}
+export Q_VDB=/var/db/pkg
mkdir -p "${ROOT}/var/db/pkg"
