aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2019-06-10 12:05:12 +0200
committerFabian Groffen <grobian@gentoo.org>2019-06-10 12:05:12 +0200
commit317a31dfc1519d8baa10bca736f719faa83692b8 (patch)
tree68180044b8296d611ab363d1bbc43057e5c02f50
parentqmerge: fix atom_compare call, make sure user argument is query (diff)
downloadportage-utils-317a31dfc1519d8baa10bca736f719faa83692b8.tar.gz
portage-utils-317a31dfc1519d8baa10bca736f719faa83692b8.tar.bz2
portage-utils-317a31dfc1519d8baa10bca736f719faa83692b8.zip
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@gentoo.org>
-rwxr-xr-xtests/qmerge/dotest11
1 files changed, 1 insertions, 10 deletions
diff --git a/tests/qmerge/dotest b/tests/qmerge/dotest
index 57e2940a..17187f99 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"