diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2014-09-16 13:26:09 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2014-09-16 13:26:09 -0700 |
| commit | 3cd37d67208512189bc1621914284b5f72242121 (patch) | |
| tree | 012bb2d4b30903fcb5d7d4e73bad5e34ffd0c4e7 | |
| parent | _solve_..slot_conflicts: fix bug #510270 (diff) | |
| download | portage-3cd37d67208512189bc1621914284b5f72242121.tar.gz portage-3cd37d67208512189bc1621914284b5f72242121.tar.bz2 portage-3cd37d67208512189bc1621914284b5f72242121.zip | |
runtests.sh: Update pypy target
| -rwxr-xr-x | runtests.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtests.sh b/runtests.sh index 599727b20..651928fcc 100755 --- a/runtests.sh +++ b/runtests.sh @@ -4,7 +4,7 @@ # These are the versions we care about. The rest are just "nice to have". PYTHON_SUPPORTED_VERSIONS="2.6 2.7 3.2 3.3 3.4" -PYTHON_VERSIONS="2.6 2.7 2.7-pypy-1.8 2.7-pypy-1.9 2.7-pypy-2.0 3.1 3.2 3.3 3.4 3.5" +PYTHON_VERSIONS="2.6 2.7 pypy 3.1 3.2 3.3 3.4 3.5" # has to be run from portage root dir cd "${0%/*}" || exit 1 @@ -60,8 +60,8 @@ exit_status="0" found_versions=() status_array=() for version in ${PYTHON_VERSIONS}; do - if [[ $version =~ ^([[:digit:]]+\.[[:digit:]]+)-pypy-([[:digit:]]+\.[[:digit:]]+)$ ]] ; then - executable=${eprefix}/usr/bin/pypy-c${BASH_REMATCH[2]} + if [[ $version = 'pypy' ]] ; then + executable=${eprefix}/usr/bin/pypy else executable=${eprefix}/usr/bin/python${version} fi |