diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
| commit | 752d6256e5204b958b0ef7905675a940b5e9172f (patch) | |
| tree | 330d16e6362a49cbed8875a777fe641a43376cd3 /dev-util/meson/meson-9999.ebuild | |
| parent | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff) | |
gentoo resync : 12.05.2022
Diffstat (limited to 'dev-util/meson/meson-9999.ebuild')
| -rw-r--r-- | dev-util/meson/meson-9999.ebuild | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild index 2d8599c3973b..9743e5a1839f 100644 --- a/dev-util/meson/meson-9999.ebuild +++ b/dev-util/meson/meson-9999.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi inherit bash-completion-r1 distutils-r1 toolchain-funcs @@ -52,7 +52,7 @@ python_prepare_all() { -e 's/test_python_module/_&/' ) - sed -i "${disable_unittests[@]}" run_unittests.py || die + sed -i "${disable_unittests[@]}" unittests/*.py || die # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die @@ -65,8 +65,6 @@ src_test() { if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then ewarn "Found Qt5Core but not Qt5Gui; skipping tests" else - # https://bugs.gentoo.org/687792 - unset PKG_CONFIG distutils-r1_src_test fi } @@ -76,6 +74,9 @@ python_test() { # test_meson_installed unset PYTHONDONTWRITEBYTECODE + # https://bugs.gentoo.org/687792 + unset PKG_CONFIG + # test_cross_file_system_paths unset XDG_DATA_HOME @@ -89,7 +90,8 @@ python_test() { # value in JAVA_HOME, and the tests should get skipped. export JAVA_HOME=$(java-config -O 2>/dev/null) - ${EPYTHON} -u run_tests.py + # Call python3 instead of EPYTHON to satisfy test_meson_uninstalled. + python3 run_tests.py ) || die "Testing failed with ${EPYTHON}" } |