| 1 |
commit: 50debcbf2f1e588edb4f3710aac5463909ec5149 |
| 2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 3 |
AuthorDate: Wed Jun 1 01:50:18 2022 +0000 |
| 4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 5 |
CommitDate: Wed Jun 1 05:02:45 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=50debcbf |
| 7 |
|
| 8 |
dev-util/psautohint: fix tests |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/816507 |
| 11 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
| 12 |
|
| 13 |
dev-util/psautohint/Manifest | 2 +- |
| 14 |
dev-util/psautohint/psautohint-2.4.0.ebuild | 33 +++++++++++++++++------------ |
| 15 |
2 files changed, 21 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/psautohint/Manifest b/dev-util/psautohint/Manifest |
| 18 |
index 34b1b4a4e..1463268e7 100644 |
| 19 |
--- a/dev-util/psautohint/Manifest |
| 20 |
+++ b/dev-util/psautohint/Manifest |
| 21 |
@@ -1,2 +1,2 @@ |
| 22 |
-DIST psautohint-2.4.0.tar.gz 181009 BLAKE2B bb6ed5ae6b800742d8d1061004bfb49a84e3b9c99977a653ef8eeccf38d9c03261be5b735df20ee93dcf712b8b6ade7a2391937f327206fc2e01f2b5bcbe9022 SHA512 dfc29d020bedf8bd546e395743befb390e9fb01a3025aa10357a32724c9a78236acd57e05300aa26be630c9d43edab8bda731dc4f51c0a07d0bef79112d952aa |
| 23 |
+DIST psautohint-2.4.0.gh.tar.gz 181009 BLAKE2B bb6ed5ae6b800742d8d1061004bfb49a84e3b9c99977a653ef8eeccf38d9c03261be5b735df20ee93dcf712b8b6ade7a2391937f327206fc2e01f2b5bcbe9022 SHA512 dfc29d020bedf8bd546e395743befb390e9fb01a3025aa10357a32724c9a78236acd57e05300aa26be630c9d43edab8bda731dc4f51c0a07d0bef79112d952aa |
| 24 |
DIST psautohint-testdata-1e4c5061d328105c4dcfcb6fdbc27ec49b3e9d23.tar.gz 21949984 BLAKE2B a5da67eb4b9f3d0ce5d86469bc0a5f771fa743198836db35121e9c62b66c8b8df00fef6e40e8832e33aee065fe3bdd0a24d1b590bce6fb66d7c43f6719236242 SHA512 03d4962958d3551ffdf99463d28723f6b43d42029843da1b40493b0bfc2e586ebf40db3a2497b36b5fde345de4b6998cfc1131c6fb4e8352b05fb59fc4e90e7f |
| 25 |
|
| 26 |
diff --git a/dev-util/psautohint/psautohint-2.4.0.ebuild b/dev-util/psautohint/psautohint-2.4.0.ebuild |
| 27 |
index 675b06317..9d1dc2d01 100644 |
| 28 |
--- a/dev-util/psautohint/psautohint-2.4.0.ebuild |
| 29 |
+++ b/dev-util/psautohint/psautohint-2.4.0.ebuild |
| 30 |
@@ -16,9 +16,9 @@ HOMEPAGE=" |
| 31 |
https://pypi.org/project/psautohint/ |
| 32 |
" |
| 33 |
SRC_URI=" |
| 34 |
- https://github.com/adobe-type-tools/psautohint/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz |
| 35 |
+ https://github.com/adobe-type-tools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz |
| 36 |
test? ( |
| 37 |
- https://github.com/adobe-type-tools/psautohint-testdata/archive/${COMMIT}.tar.gz -> psautohint-testdata-${COMMIT}.tar.gz |
| 38 |
+ https://github.com/adobe-type-tools/${PN}-testdata/archive/${COMMIT}.tar.gz -> psautohint-testdata-${COMMIT}.tar.gz |
| 39 |
) |
| 40 |
" |
| 41 |
KEYWORDS="~amd64" |
| 42 |
@@ -32,7 +32,6 @@ RDEPEND=" |
| 43 |
dev-python/fs[${PYTHON_USEDEP}] |
| 44 |
dev-python/lxml[${PYTHON_USEDEP}] |
| 45 |
" |
| 46 |
-DEPEND="${RDEPEND}" |
| 47 |
|
| 48 |
PATCHES=( |
| 49 |
"${FILESDIR}/${PN}-bininpath.diff" |
| 50 |
@@ -40,6 +39,15 @@ PATCHES=( |
| 51 |
"${FILESDIR}/${PN}-2.3.0-no-werror.patch" |
| 52 |
) |
| 53 |
|
| 54 |
+EPYTEST_DESELECT=( |
| 55 |
+ tests/integration/test_hint.py::test_hashmap_old_version |
| 56 |
+ tests/integration/test_hint.py::test_mute_tx_msgs |
| 57 |
+ tests/integration/test_hint.py::test_type1_supported |
| 58 |
+ tests/integration/test_mmhint.py::test_vfotf |
| 59 |
+ tests/integration/test_cli.py::test_multi_outpath |
| 60 |
+ tests/integration/test_cli.py::test_multi_different_formats |
| 61 |
+) |
| 62 |
+ |
| 63 |
distutils_enable_tests pytest |
| 64 |
|
| 65 |
pkg_setup() { |
| 66 |
@@ -50,9 +58,14 @@ pkg_setup() { |
| 67 |
|
| 68 |
src_unpack() { |
| 69 |
default |
| 70 |
- if [ -d "${WORKDIR}/psautohint-testdata-${COMMIT}" ]; then |
| 71 |
- mv "${WORKDIR}/psautohint-testdata-${COMMIT}"/* "${S}/tests/integration/data/" || die |
| 72 |
- fi |
| 73 |
+ mv "${WORKDIR}"/psautohint-testdata-${COMMIT}/* "${S}"/tests/integration/data || die |
| 74 |
+} |
| 75 |
+ |
| 76 |
+python_prepare_all() { |
| 77 |
+ # error: unrecognized arguments: -n |
| 78 |
+ sed "/^ /d" -i pytest.ini || die |
| 79 |
+ |
| 80 |
+ distutils-r1_python_prepare_all |
| 81 |
} |
| 82 |
|
| 83 |
src_configure() { |
| 84 |
@@ -80,11 +93,5 @@ python_test() { |
| 85 |
local -x PATH="${BUILD_DIR}/test/scripts:${MESON_BUILD_DIR}l:${PATH}" |
| 86 |
local -x LD_LIBRARY_PATH="${MESON_BUILD_DIR}" |
| 87 |
distutils_install_for_testing |
| 88 |
- epytest -vv \ |
| 89 |
- --deselect tests/integration/test_hint.py::test_hashmap_old_version \ |
| 90 |
- --deselect tests/integration/test_mmhint.py::test_vfotf[tests/integration/data/vf_tests/CJKSparseVar.subset.hinted.otf] \ |
| 91 |
- --deselect tests/integration/test_mmhint.py::test_vfotf[tests/integration/data/vf_tests/bug816.hinted.otf] \ |
| 92 |
- --deselect tests/integration/test_cli.py::test_multi_outpath \ |
| 93 |
- --deselect tests/integration/test_cli.py::test_multi_different_formats \ |
| 94 |
- || die |
| 95 |
+ epytest |
| 96 |
} |
Archives