summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-09-04 14:00:43 +0000
committerMichał Górny <mgorny@gentoo.org>2014-09-04 14:00:43 +0000
commitb7368430709e6d1d6bec0be01783841093268ee3 (patch)
treee721848d8d1c38bf8ded85991550a3088feedc23 /eclass
parentBump to EAPI=5 (diff)
downloadgentoo-2-b7368430709e6d1d6bec0be01783841093268ee3.tar.gz
gentoo-2-b7368430709e6d1d6bec0be01783841093268ee3.tar.bz2
gentoo-2-b7368430709e6d1d6bec0be01783841093268ee3.zip
Fix tests for python_is_python3.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rwxr-xr-xeclass/tests/python-utils-r1.sh8
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index b19353c6966e..1bd657069890 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1364 2014/09/03 21:52:44 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1365 2014/09/04 14:00:43 mgorny Exp $
+
+ 04 Sep 2014; Michał Górny <mgorny@gentoo.org> tests/python-utils-r1.sh:
+ Fix tests for python_is_python3.
03 Sep 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+mozconfig-v4.1.eclass:
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index 258da789bef6..5128bf9c8f8b 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -87,10 +87,10 @@ test_var PYTHON_INCLUDEDIR pypy /usr/lib/pypy/include
test_var PYTHON_PKG_DEP pypy '*virtual/pypy*:0='
test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy
-test_is "EPYTHON=python2.7 python_is_python3" 1
-test_is "EPYTHON=python3.2 python_is_python3" 0
-test_is "EPYTHON=jython2.7 python_is_python3" 1
-test_is "EPYTHON=pypy python_is_python3" 1
+test_is "python_is_python3 python2.7" 1
+test_is "python_is_python3 python3.2" 0
+test_is "python_is_python3 jython2.7" 1
+test_is "python_is_python3 pypy" 1
# generic shebangs
test_fix_shebang '#!/usr/bin/python' python2.7 '#!/usr/bin/python2.7'