| 1 |
commit: 9f8c659431bbe554bbe96cb074c9e3fe957b72ce |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 4 14:56:45 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 4 14:56:45 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f8c6594 |
| 7 |
|
| 8 |
dev-util/meson: backport Python 3.5 tests fix |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.59_p2, Repoman-2.3.12_p67 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
.../meson/files/meson-0.49-python3.5-tests.patch | 34 ++++++++++++++++++++++ |
| 14 |
dev-util/meson/meson-0.49.2.ebuild | 9 +++--- |
| 15 |
dev-util/meson/meson-9999.ebuild | 5 ---- |
| 16 |
3 files changed, 38 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/meson/files/meson-0.49-python3.5-tests.patch b/dev-util/meson/files/meson-0.49-python3.5-tests.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..640348b2bc2 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-util/meson/files/meson-0.49-python3.5-tests.patch |
| 23 |
@@ -0,0 +1,34 @@ |
| 24 |
+From 65192af2ff62a032a3f19d065c95e12b83aae709 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Simon McVittie <smcv@×××××××××.com> |
| 26 |
+Date: Fri, 11 Jan 2019 18:03:15 +0000 |
| 27 |
+Subject: [PATCH] run_unittests: Use Python 3.5-compatible subprocess |
| 28 |
+ invocation |
| 29 |
+ |
| 30 |
+subprocess.run() didn't get the encoding parameter until 3.6. |
| 31 |
+ |
| 32 |
+Signed-off-by: Simon McVittie <smcv@×××××××××.com> |
| 33 |
+--- |
| 34 |
+ run_unittests.py | 7 +++---- |
| 35 |
+ 1 file changed, 3 insertions(+), 4 deletions(-) |
| 36 |
+ |
| 37 |
+diff --git a/run_unittests.py b/run_unittests.py |
| 38 |
+index 342ad883..e1246140 100755 |
| 39 |
+--- a/run_unittests.py |
| 40 |
++++ b/run_unittests.py |
| 41 |
+@@ -5029,10 +5029,9 @@ class NativeFileTests(BasePlatformTests): |
| 42 |
+ ret = subprocess.run( |
| 43 |
+ ["{}"] + extra_args, |
| 44 |
+ stdout=subprocess.PIPE, |
| 45 |
+- stderr=subprocess.PIPE, |
| 46 |
+- encoding='utf-8') |
| 47 |
+- print(ret.stdout) |
| 48 |
+- print(ret.stderr, file=sys.stderr) |
| 49 |
++ stderr=subprocess.PIPE) |
| 50 |
++ print(ret.stdout.decode('utf-8')) |
| 51 |
++ print(ret.stderr.decode('utf-8'), file=sys.stderr) |
| 52 |
+ sys.exit(ret.returncode) |
| 53 |
+ |
| 54 |
+ if __name__ == '__main__': |
| 55 |
+-- |
| 56 |
+2.21.0 |
| 57 |
+ |
| 58 |
|
| 59 |
diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild |
| 60 |
index af2f0b75de8..09b40845cc6 100644 |
| 61 |
--- a/dev-util/meson/meson-0.49.2.ebuild |
| 62 |
+++ b/dev-util/meson/meson-0.49.2.ebuild |
| 63 |
@@ -33,6 +33,10 @@ DEPEND="${RDEPEND} |
| 64 |
) |
| 65 |
" |
| 66 |
|
| 67 |
+PATCHES=( |
| 68 |
+ "${FILESDIR}/meson-0.49-python3.5-tests.patch" |
| 69 |
+) |
| 70 |
+ |
| 71 |
python_prepare_all() { |
| 72 |
# ASAN and sandbox both want control over LD_PRELOAD |
| 73 |
# https://bugs.gentoo.org/673016 |
| 74 |
@@ -51,11 +55,6 @@ src_test() { |
| 75 |
} |
| 76 |
|
| 77 |
python_test() { |
| 78 |
- if [[ ${EPYTHON} == python3.5 ]]; then |
| 79 |
- ewarn "Skipping tests with ${EPYTHON}" |
| 80 |
- return 0 |
| 81 |
- fi |
| 82 |
- |
| 83 |
( |
| 84 |
# test_meson_installed |
| 85 |
unset PYTHONDONTWRITEBYTECODE |
| 86 |
|
| 87 |
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild |
| 88 |
index af2f0b75de8..89b176910cb 100644 |
| 89 |
--- a/dev-util/meson/meson-9999.ebuild |
| 90 |
+++ b/dev-util/meson/meson-9999.ebuild |
| 91 |
@@ -51,11 +51,6 @@ src_test() { |
| 92 |
} |
| 93 |
|
| 94 |
python_test() { |
| 95 |
- if [[ ${EPYTHON} == python3.5 ]]; then |
| 96 |
- ewarn "Skipping tests with ${EPYTHON}" |
| 97 |
- return 0 |
| 98 |
- fi |
| 99 |
- |
| 100 |
( |
| 101 |
# test_meson_installed |
| 102 |
unset PYTHONDONTWRITEBYTECODE |
Archives