From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DB9C659CA2 for ; Sun, 14 Feb 2016 01:26:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1699421C023; Sun, 14 Feb 2016 01:26:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8884D21C023 for ; Sun, 14 Feb 2016 01:26:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C73F2340BEA for ; Sun, 14 Feb 2016 01:26:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 36ECB1562 for ; Sun, 14 Feb 2016 01:26:32 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1455411763.d858df8a53df7e43bc6c2ece945cff7104ae762b.vapier@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: tests/atom_explode/ X-VCS-Repository: proj/portage-utils X-VCS-Files: tests/atom_explode/atom-explode.py tests/atom_explode/dotest X-VCS-Directories: tests/atom_explode/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: d858df8a53df7e43bc6c2ece945cff7104ae762b X-VCS-Branch: master Date: Sun, 14 Feb 2016 01:26:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fdca045e-94d1-4c88-8d98-aeed21f86163 X-Archives-Hash: e44fa1e270a80c1aa904b74f6ac816c5 commit: d858df8a53df7e43bc6c2ece945cff7104ae762b Author: Mike Frysinger gentoo org> AuthorDate: Sun Feb 14 01:02:43 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sun Feb 14 01:02:43 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d858df8a tests: atom_explode: get tests running again Change to extracting PORTDIR from q itself rather than portageq. This is just putting off the full fix (walking all repos), but it gets things running/passing again. After some recent changes, we also need to update the python code so its output matches the q code. Otherwise all the tests fail as none of the lines match. URL: https://bugs.gentoo.org/567336 Reported-by: tka kamph.org tests/atom_explode/atom-explode.py | 2 +- tests/atom_explode/dotest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/atom_explode/atom-explode.py b/tests/atom_explode/atom-explode.py index 03ea0bf..d28aaed 100755 --- a/tests/atom_explode/atom-explode.py +++ b/tests/atom_explode/atom-explode.py @@ -11,7 +11,7 @@ def doit(a): PV = cpv[2] PR_int = cpv[3] P = PN + "-" + PV - PVR = P + "-" + cpv[3] + PVR = PV + "-" + cpv[3] print(a+" -> "+CATEGORY+" / ["+P+"] "+PN+" - "+PVR+" ["+PV+"] ["+PR_int+"]") for a in sys.argv[1:]: diff --git a/tests/atom_explode/dotest b/tests/atom_explode/dotest index 41d282a..e852bc0 100755 --- a/tests/atom_explode/dotest +++ b/tests/atom_explode/dotest @@ -2,7 +2,7 @@ . ../init.sh || exit 1 -: ${PORTDIR:=$(portageq envvar PORTDIR)} +PORTDIR=$(DEBUG=: q -Ch 2>&1 | grep ^PORTDIR | awk '{print $NF}') pushd "${PORTDIR}"/metadata/md5-cache >/dev/null || { echo SKIPPED; exit 0 ; } if [[ $1 == -v ]] ; then