From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rx6TA-0001P3-DT for garchives@archives.gentoo.org; Tue, 14 Feb 2012 00:42:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01611E0A60; Tue, 14 Feb 2012 00:41:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C7808E0A60 for ; Tue, 14 Feb 2012 00:41:55 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 371091B4018 for ; Tue, 14 Feb 2012 00:41:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E7D62E5400 for ; Tue, 14 Feb 2012 00:41:53 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1329180098.d806b859e0a7181c30bd13a7714cd47e5a582314.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: / X-VCS-Repository: proj/portage X-VCS-Files: runtests.sh X-VCS-Directories: / X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d806b859e0a7181c30bd13a7714cd47e5a582314 X-VCS-Branch: master Date: Tue, 14 Feb 2012 00:41:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: bf2bd2d6-5f4a-4c3e-b0bf-9cd0e6eecbbd X-Archives-Hash: 26539b8c7f3b2ed0d02fcaa5bc507f31 commit: d806b859e0a7181c30bd13a7714cd47e5a582314 Author: Zac Medico gentoo org> AuthorDate: Tue Feb 14 00:41:38 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Feb 14 00:41:38 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd806b859 runtests.sh: test PyPy 1.8, and support prefix --- runtests.sh | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/runtests.sh b/runtests.sh index 30ddeef..56aa2cc 100755 --- a/runtests.sh +++ b/runtests.sh @@ -1,8 +1,8 @@ #!/bin/bash -# Copyright 2010-2011 Gentoo Foundation +# Copyright 2010-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 -PYTHON_VERSIONS=3D"2.6 2.7 3.1 3.2 3.3" +PYTHON_VERSIONS=3D"2.6 2.7 2.7-pypy-1.8 3.1 3.2 3.3" =20 # has to be run from portage root dir cd "${0%/*}" || exit 1 @@ -47,11 +47,17 @@ done =20 set -- "${unused_args[@]}" =20 +eprefix=3D${PORTAGE_OVERRIDE_EPREFIX} exit_status=3D"0" for version in ${PYTHON_VERSIONS}; do - if [[ -x /usr/bin/python${version} ]]; then + if [[ $version =3D~ ^([[:digit:]]+\.[[:digit:]]+)-pypy-([[:digit:]]+\.[= [:digit:]]+)$ ]] ; then + executable=3D${eprefix}/usr/bin/pypy-c${BASH_REMATCH[2]} + else + executable=3D${eprefix}/usr/bin/python${version} + fi + if [[ -x "${executable}" ]]; then echo -e "${GOOD}Testing with Python ${version}...${NORMAL}" - if ! /usr/bin/python${version} -Wd pym/portage/tests/runTests "$@" ; t= hen + if ! "${executable}" -Wd pym/portage/tests/runTests "$@" ; then echo -e "${BAD}Testing with Python ${version} failed${NORMAL}" exit_status=3D"1" fi