From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage-utils:master commit in: tests/qmerge/
Date: Mon, 10 Jun 2019 10:09:06 +0000 (UTC) [thread overview]
Message-ID: <1560161112.317a31dfc1519d8baa10bca736f719faa83692b8.grobian@gentoo> (raw)
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"
next reply other threads:[~2019-06-10 10:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-10 10:09 Fabian Groffen [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-25 10:43 [gentoo-commits] proj/portage-utils:master commit in: tests/qmerge/ Fabian Groffen
2020-01-03 12:45 Fabian Groffen
2020-01-03 11:27 Fabian Groffen
2019-06-10 15:29 Fabian Groffen
2019-06-10 12:50 Fabian Groffen
2019-06-10 12:50 Fabian Groffen
2019-05-10 11:52 Fabian Groffen
2016-12-29 2:25 Mike Frysinger
2015-02-24 1:26 Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1560161112.317a31dfc1519d8baa10bca736f719faa83692b8.grobian@gentoo \
--to=grobian@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox