Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/tests/
Date: Mon, 30 Mar 2020 13:11:16
Message-Id: 1585573866.38b8184d18a7c43559f6578e9974703350cc3ed1.mgorny@gentoo
1 commit: 38b8184d18a7c43559f6578e9974703350cc3ed1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 30 13:10:11 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 30 13:11:06 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38b8184d
7
8 eclass/tests/python-utils-r1.sh: Remove tests for jython & pypy
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 eclass/tests/python-utils-r1.sh | 31 -------------------------------
13 1 file changed, 31 deletions(-)
14
15 diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
16 index 2ce425be15e..377bb474a3a 100755
17 --- a/eclass/tests/python-utils-r1.sh
18 +++ b/eclass/tests/python-utils-r1.sh
19 @@ -101,23 +101,6 @@ fi
20 test_var PYTHON_PKG_DEP python3_7 '*dev-lang/python*:3.7'
21 test_var PYTHON_SCRIPTDIR python3_7 /usr/lib/python-exec/python3.7
22
23 -test_var EPYTHON jython2_7 jython2.7
24 -test_var PYTHON jython2_7 /usr/bin/jython2.7
25 -if [[ -x /usr/bin/jython2.7 ]]; then
26 - test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages
27 -fi
28 -test_var PYTHON_PKG_DEP jython2_7 '*dev-java/jython*:2.7'
29 -test_var PYTHON_SCRIPTDIR jython2_7 /usr/lib/python-exec/jython2.7
30 -
31 -test_var EPYTHON pypy pypy
32 -test_var PYTHON pypy /usr/bin/pypy
33 -if [[ -x /usr/bin/pypy ]]; then
34 - test_var PYTHON_SITEDIR pypy "/usr/lib*/pypy2.7/site-packages"
35 - test_var PYTHON_INCLUDEDIR pypy "/usr/lib*/pypy2.7/include"
36 -fi
37 -test_var PYTHON_PKG_DEP pypy '*dev-python/pypy*:0='
38 -test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy
39 -
40 test_var EPYTHON pypy3 pypy3
41 test_var PYTHON pypy3 /usr/bin/pypy3
42 if [[ -x /usr/bin/pypy3 ]]; then
43 @@ -129,16 +112,13 @@ test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3
44
45 test_is "python_is_python3 python2.7" 1
46 test_is "python_is_python3 python3.2" 0
47 -test_is "python_is_python3 jython2.7" 1
48 test_is "python_is_python3 pypy" 1
49 test_is "python_is_python3 pypy3" 0
50
51 # generic shebangs
52 test_fix_shebang '#!/usr/bin/python' python2.7 '#!/usr/bin/python2.7'
53 test_fix_shebang '#!/usr/bin/python' python3.6 '#!/usr/bin/python3.6'
54 -test_fix_shebang '#!/usr/bin/python' pypy '#!/usr/bin/pypy'
55 test_fix_shebang '#!/usr/bin/python' pypy3 '#!/usr/bin/pypy3'
56 -test_fix_shebang '#!/usr/bin/python' jython2.7 '#!/usr/bin/jython2.7'
57
58 # python2/python3 matching
59 test_fix_shebang '#!/usr/bin/python2' python2.7 '#!/usr/bin/python2.7'
60 @@ -155,12 +135,8 @@ test_fix_shebang '#!/usr/bin/python2.7' python3.2 '#!/usr/bin/python3.2' --force
61 test_fix_shebang '#!/usr/bin/python3.2' python3.2 '#!/usr/bin/python3.2'
62 test_fix_shebang '#!/usr/bin/python3.2' python2.7 FAIL
63 test_fix_shebang '#!/usr/bin/python3.2' python2.7 '#!/usr/bin/python2.7' --force
64 -test_fix_shebang '#!/usr/bin/pypy' pypy '#!/usr/bin/pypy'
65 test_fix_shebang '#!/usr/bin/pypy' python2.7 FAIL
66 test_fix_shebang '#!/usr/bin/pypy' python2.7 '#!/usr/bin/python2.7' --force
67 -test_fix_shebang '#!/usr/bin/jython2.7' jython2.7 '#!/usr/bin/jython2.7'
68 -test_fix_shebang '#!/usr/bin/jython2.7' jython3.2 FAIL
69 -test_fix_shebang '#!/usr/bin/jython2.7' jython3.2 '#!/usr/bin/jython3.2' --force
70
71 # fancy path handling
72 test_fix_shebang '#!/mnt/python2/usr/bin/python' python3.6 \
73 @@ -196,39 +172,32 @@ test_is "_python_impl_supported pypy1_9" 1
74 test_is "_python_impl_supported pypy2_0" 1
75 test_is "_python_impl_supported pypy" 1
76 test_is "_python_impl_supported pypy3" 0
77 -test_is "_python_impl_supported jython2_7" 1
78
79 # check _python_impl_matches behavior
80 test_is "_python_impl_matches python2_7 -2" 0
81 test_is "_python_impl_matches python3_6 -2" 1
82 test_is "_python_impl_matches python3_7 -2" 1
83 -test_is "_python_impl_matches pypy -2" 0
84 test_is "_python_impl_matches pypy3 -2" 1
85 test_is "_python_impl_matches python2_7 -3" 1
86 test_is "_python_impl_matches python3_6 -3" 0
87 test_is "_python_impl_matches python3_7 -3" 0
88 -test_is "_python_impl_matches pypy -3" 1
89 test_is "_python_impl_matches pypy3 -3" 0
90 test_is "_python_impl_matches python2_7 -2 python3_6" 0
91 test_is "_python_impl_matches python3_6 -2 python3_6" 0
92 test_is "_python_impl_matches python3_7 -2 python3_6" 1
93 -test_is "_python_impl_matches pypy -2 python3_6" 0
94 test_is "_python_impl_matches pypy3 -2 python3_6" 1
95 test_is "_python_impl_matches python2_7 pypy3 -2 python3_6" 0
96 test_is "_python_impl_matches python3_6 pypy3 -2 python3_6" 0
97 test_is "_python_impl_matches python3_7 pypy3 -2 python3_6" 1
98 -test_is "_python_impl_matches pypy pypy3 -2 python3_6" 0
99 test_is "_python_impl_matches pypy3 pypy3 -2 python3_6" 0
100 set -f
101 test_is "_python_impl_matches python2_7 pypy*" 1
102 test_is "_python_impl_matches python3_6 pypy*" 1
103 test_is "_python_impl_matches python3_7 pypy*" 1
104 -test_is "_python_impl_matches pypy pypy*" 0
105 test_is "_python_impl_matches pypy3 pypy*" 0
106 test_is "_python_impl_matches python2_7 python*" 0
107 test_is "_python_impl_matches python3_6 python*" 0
108 test_is "_python_impl_matches python3_7 python*" 0
109 -test_is "_python_impl_matches pypy python*" 1
110 test_is "_python_impl_matches pypy3 python*" 1
111 set +f