aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2012-10-22 19:23:27 +0200
committerFabian Groffen <grobian@gentoo.org>2012-10-22 19:23:27 +0200
commit79403078f737a0d836394b3ebe37fe9435c56ae6 (patch)
treedc249cc27701df4ca737d4d1449fd0a614abc3d0 /runtests.sh
parentMerge remote-tracking branch 'overlays-gentoo-org/master' into prefix (diff)
parentemaint logs --help: fix module-options typo (diff)
downloadportage-79403078f737a0d836394b3ebe37fe9435c56ae6.tar.gz
portage-79403078f737a0d836394b3ebe37fe9435c56ae6.tar.bz2
portage-79403078f737a0d836394b3ebe37fe9435c56ae6.zip
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
Conflicts: cnf/make.globals pym/_emerge/main.py pym/portage/dbapi/vartree.py pym/portage/getbinpkg.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 59cec2d12..31934093a 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 2.7-pypy-1.9 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 3.4"
# has to be run from portage root dir
cd "${0%/*}" || exit 1