aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2012-07-06 09:02:23 +0200
committerFabian Groffen <grobian@gentoo.org>2012-07-06 09:02:23 +0200
commitf028e1bfb2b97990b558b0c1a8782838aeae175c (patch)
treebfaceeb9333f6ca440003e043fae5b15c43e7cd7 /runtests.sh
parentbuild-sys: avoid harmless error message during install (diff)
parentPORTAGE_GPG_SIGNING_COMMAND: --digest-algo SHA512 (diff)
downloadportage-f028e1bfb2b97990b558b0c1a8782838aeae175c.tar.gz
portage-f028e1bfb2b97990b558b0c1a8782838aeae175c.tar.bz2
portage-f028e1bfb2b97990b558b0c1a8782838aeae175c.zip
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
Conflicts: bin/dohtml.py bin/ebuild bin/ebuild-helpers/ecompressdir bin/ebuild-helpers/prepstrip bin/ebuild-ipc.py bin/egencache bin/emaint bin/emerge bin/misc-functions.sh bin/quickpkg pym/_emerge/actions.py pym/portage/dbapi/vartree.py pym/portage/dispatch_conf.py
Diffstat (limited to 'runtests.sh')
-rwxr-xr-xruntests.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtests.sh b/runtests.sh
index 1c3d3c3f1..59cec2d12 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -2,7 +2,7 @@
# Copyright 2010-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-PYTHON_VERSIONS="2.6 2.7 2.7-pypy-1.8 3.1 3.2 3.3"
+PYTHON_VERSIONS="2.6 2.7 2.7-pypy-1.8 2.7-pypy-1.9 3.1 3.2 3.3"
# has to be run from portage root dir
cd "${0%/*}" || exit 1