From a4a619bc98140750176b84f263ed3cb6c006041b Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 28 Feb 2025 11:46:54 -0500 Subject: [PATCH] =?UTF-8?q?srcpkgs:=20re=C3=ABnable=20tests=20in=20CI=20wh?= =?UTF-8?q?ere=20possible?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mostly failures due to root-ness --- srcpkgs/bash-completion/template | 8 -------- srcpkgs/beets/template | 1 - srcpkgs/coreutils/template | 6 ------ srcpkgs/cups/template | 1 - srcpkgs/etckeeper/template | 1 - srcpkgs/fd/template | 4 ---- srcpkgs/fish-shell/template | 2 -- srcpkgs/flac/template | 2 -- srcpkgs/github-cli/template | 4 ---- srcpkgs/gnuradio/template | 4 ---- srcpkgs/immortal/template | 1 - srcpkgs/just/template | 1 - srcpkgs/khal/template | 1 - srcpkgs/libssh/template | 1 - srcpkgs/libuv/template | 2 -- srcpkgs/lsd/template | 7 ------- srcpkgs/make/template | 1 - srcpkgs/mkinitcpio/template | 4 ---- srcpkgs/postgresql16/template | 1 - srcpkgs/postgresql17/template | 1 - srcpkgs/python3-Twisted/template | 1 - srcpkgs/python3-send2trash/template | 7 ------- srcpkgs/sheldon/template | 4 ---- srcpkgs/subversion-kwallet-auth/template | 6 ------ srcpkgs/subversion/template | 6 ------ srcpkgs/trash-cli/template | 2 -- srcpkgs/txr/template | 3 --- 27 files changed, 82 deletions(-) diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template index b277b4d1180..398bcda9fea 100644 --- a/srcpkgs/bash-completion/template +++ b/srcpkgs/bash-completion/template @@ -46,14 +46,6 @@ _test_deselect=" unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_4 " -if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then - # these fail on CI because of some confusion with the homedir - _test_deselect+=" - unit/test_unit_expand.py::TestUnitExpand::test_user_home - unit/test_unit_expand_tilde_by_ref.py::TestUnitExpandTildeByRef::test_expand - " -fi - pre_check() { for t in $_test_deselect; do PYTEST_ADDOPTS+=" --deselect=t/$t" diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template index e0eb91a2469..2010f75f1f7 100644 --- a/srcpkgs/beets/template +++ b/srcpkgs/beets/template @@ -24,7 +24,6 @@ distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz checksum="cc0a277f530844575e3374021f316da16bf78ed514963c1ab1597168a8d4c715 74675a1171809b4190bc1d734931a1ba12cba13083521b50a008cdaaa738736e" skip_extraction="_beet" -make_check=ci-skip # tests don't work as root post_install() { vman man/beet.1 diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template index e83bd71f18a..d837627ecb3 100644 --- a/srcpkgs/coreutils/template +++ b/srcpkgs/coreutils/template @@ -107,12 +107,6 @@ do_check() { vsed -i "s/test-$test\$(EXEEXT) //" gnulib-tests/Makefile done - if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then - vsed -i '/tests\/tail\/inotify-dir-recreate/d' Makefile - vsed -i '/tests\/du\/long-from-unreadable/d' Makefile - vsed -i '/tests\/dd\/no-allocate/d' Makefile - fi - make check } diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index 3f980bd935e..2bbfd2f7f0a 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -27,7 +27,6 @@ make_dirs=" /var/cache/cups/rss 0750 cups lp /var/spool/cups 0755 cups lp /etc/cups/ssl 0700 cups lp" -make_check=ci-skip # testsuite does not run as root build_options="avahi gssapi" build_options_default="avahi" diff --git a/srcpkgs/etckeeper/template b/srcpkgs/etckeeper/template index 563d59f1863..728df8d5d3c 100644 --- a/srcpkgs/etckeeper/template +++ b/srcpkgs/etckeeper/template @@ -14,7 +14,6 @@ license="GPL-2.0-or-later" homepage="https://etckeeper.branchable.com" distfiles="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${pkgname}-${version}.tar.gz" checksum=a87c5e9c847c29f761da933c1cd907779545c7ddf92fb75de8ef692b90fc9e5d -make_check=ci-skip # due to not detecting chroot pre_install() { sed -ni '/systemddir/!p' Makefile diff --git a/srcpkgs/fd/template b/srcpkgs/fd/template index 0ed188e8e46..d2f96d0fb1b 100644 --- a/srcpkgs/fd/template +++ b/srcpkgs/fd/template @@ -12,10 +12,6 @@ changelog="https://raw.githubusercontent.com/sharkdp/fd/master/CHANGELOG.md" distfiles="https://github.com/sharkdp/fd/archive/refs/tags/v${version}.tar.gz" checksum=73329fe24c53f0ca47cd0939256ca5c4644742cb7c14cf4114c8c9871336d342 -if [ "${XBPS_BUILD_ENVIRONMENT}" = "void-packages-ci" ]; then - make_check_args="-- --skip test_type_executable" -fi - post_install() { vman doc/fd.1 vlicense LICENSE-MIT diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template index 29ad3da53db..2af39cca523 100644 --- a/srcpkgs/fish-shell/template +++ b/srcpkgs/fish-shell/template @@ -17,8 +17,6 @@ changelog="https://raw.githubusercontent.com/fish-shell/fish-shell/refs/heads/ma distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz" checksum=2fda5bd970357064d8d4c896e08285ba59965ca2a8c4829ca8a82bf3b89c69f3 register_shell="/bin/fish /usr/bin/fish" -# tests don't work as root -make_check=ci-skip post_install() { # Starting with fish-3.0.0 this is a skeleton file with only comments diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template index 8e9051c9c51..75cc796e0da 100644 --- a/srcpkgs/flac/template +++ b/srcpkgs/flac/template @@ -14,8 +14,6 @@ homepage="https://xiph.org/flac/" changelog="https://xiph.org/flac/changelog.html" distfiles="https://downloads.xiph.org/releases/flac/flac-${version}.tar.xz" checksum=6c58e69cd22348f441b861092b825e591d0b822e106de6eb0ee4d05d27205b70 -# the tests fail when run as root and as such break in the CI containers -make_check=ci-skip # TODO: make into options case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template index 3077c20f53f..bd3564b94e9 100644 --- a/srcpkgs/github-cli/template +++ b/srcpkgs/github-cli/template @@ -16,10 +16,6 @@ changelog="https://github.com/cli/cli/releases" distfiles="https://github.com/cli/cli/archive/refs/tags/v${version}.tar.gz" checksum=8f685207c63cebfde375a20b235e34012d75d4d41fbaad8b2cc1b8cfc1eceae8 -if [ "${XBPS_BUILD_ENVIRONMENT}" = void-packages-ci ]; then - make_check_args+=" -skip TestMigrationWriteErrors" -fi - pre_build() { local _date if [ "$SOURCE_DATE_EPOCH" ]; then diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 6e6f8b6dd77..f5518464018 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -31,10 +31,6 @@ if [ "$CROSS_BUILD" ]; then configure_args+=" -DENABLE_TESTING=OFF -DPYBIND11_USE_CROSSCOMPILING=ON" fi -if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then - make_check=ci-skip # See https://github.com/gnuradio/gnuradio/issues/5973 -fi - post_install() { rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \ ${DESTDIR}/usr/share/gnuradio/examples/qt-gui/display_qt \ diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template index 8d507ade018..683633b4032 100644 --- a/srcpkgs/immortal/template +++ b/srcpkgs/immortal/template @@ -13,7 +13,6 @@ license="BSD-3-Clause" homepage="https://github.com/immortal/immortal" distfiles="https://github.com/immortal/immortal/archive/${version}.tar.gz" checksum=a343581dbe58fb0faa1c65b233a067820d8d5ecefc9726da5ad3ef979a2a0b08 -make_check=ci-skip # some tests fail when running as root post_install() { for f in man/* ; do diff --git a/srcpkgs/just/template b/srcpkgs/just/template index e2b0b862c97..8a871805c2c 100644 --- a/srcpkgs/just/template +++ b/srcpkgs/just/template @@ -13,7 +13,6 @@ homepage="https://github.com/casey/just" changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md" distfiles="https://github.com/casey/just/archive/refs/tags/${version}.tar.gz" checksum=8a900072d7f909bc91030df5896168752bb9108967dbb7149d2cfb11fdeb087a -make_check=ci-skip # test fails when run as root # Fix failing test pre_check() { diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template index 5526edd35ff..10d7f39d2e6 100644 --- a/srcpkgs/khal/template +++ b/srcpkgs/khal/template @@ -22,7 +22,6 @@ homepage="http://lostpackets.de/khal/" changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz" checksum=a8ccbcc43fc1dbbc464e53f7f1d99cf15832be43a67f38700e535d99d9c1325e -make_check=ci-skip # some tests fail when running as root post_install() { vlicense COPYING diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template index 37a56e93e2a..e7963891198 100644 --- a/srcpkgs/libssh/template +++ b/srcpkgs/libssh/template @@ -13,7 +13,6 @@ homepage="https://www.libssh.org/" changelog="https://git.libssh.org/projects/libssh.git/plain/CHANGELOG" distfiles="https://git.libssh.org/projects/libssh.git/snapshot/libssh-${version}.tar.gz" checksum=d639d8c18a6b439e6f2047b3ea2a32b4113016f239b86c1ba8e082b02a1aeb1c -make_check=ci-skip # some tests fail when running as root case "$XBPS_TARGET_MACHINE" in *-musl) configure_args="-DHAVE_GLOB=0" ;; diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template index 04c127f0115..c837059ea58 100644 --- a/srcpkgs/libuv/template +++ b/srcpkgs/libuv/template @@ -11,8 +11,6 @@ homepage="https://libuv.org/" changelog="https://raw.githubusercontent.com/libuv/libuv/v1.x/ChangeLog" distfiles="https://dist.libuv.org/dist/v${version}/libuv-v${version}-dist.tar.gz" checksum=2e910e668e5daf1be6a5195a696985d7200adfa5c4d3400ee7b3355affdcf52c -# the tests fail when run as root and as such break in the CI containers -make_check=ci-skip LDFLAGS="-pthread" diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template index f47bbf51366..fa33ff11554 100644 --- a/srcpkgs/lsd/template +++ b/srcpkgs/lsd/template @@ -15,13 +15,6 @@ distfiles="https://github.com/lsd-rs/lsd/archive/refs/tags/v${version}.tar.gz" checksum=120935c7e98f9b64488fde39987154a6a5b2236cb65ae847917012adf5e122d1 conflicts="disputils" -# The 'cannot_access_subdir_exit_status' fails on CI -# because the runner seems to allow setting the b dir in a/b/c to readonly (0400) -# and then navigating this structure recursively (like in `tree`) -if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then - make_check_args="-- --skip test_cannot_access_subdir_exit_status" -fi - export SHELL_COMPLETIONS_DIR="${wrksrc}" post_install() { diff --git a/srcpkgs/make/template b/srcpkgs/make/template index 72934811c3c..930a357f3f3 100644 --- a/srcpkgs/make/template +++ b/srcpkgs/make/template @@ -15,4 +15,3 @@ homepage="http://www.gnu.org/software/make" distfiles="${GNU_SITE}/make/${pkgname}-${version}.tar.lz" checksum=8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9 build_options=guile -make_check=ci-skip #features/temp_stdin Error running /builddir/make-4.4.1/tests/../make (expected 512; got 0) diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template index 81ec4647943..432ec3de9ed 100644 --- a/srcpkgs/mkinitcpio/template +++ b/srcpkgs/mkinitcpio/template @@ -21,10 +21,6 @@ alternatives=" replaces="mkinitcpio-udev>=0" make_dirs="/etc/mkinitcpio.conf.d 0755 root root" -pre_check() { - export BATS_ARGS="--filter-tags '!no_root'" -} - post_install() { # Remove unneeded systemd bits rm -r ${DESTDIR}/usr/lib/kernel diff --git a/srcpkgs/postgresql16/template b/srcpkgs/postgresql16/template index 87928680ff1..a06b1093d85 100644 --- a/srcpkgs/postgresql16/template +++ b/srcpkgs/postgresql16/template @@ -22,7 +22,6 @@ homepage="https://www.postgresql.org" changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html" distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2" checksum=9468083a56ce0ee7d294601b74dad3dd9fc69d87aff61f0a9fb63c813ff7efd8 -make_check=ci-skip # Postgres server can't be run as root conf_files=" /${_sysconfdir}/default/postgresql diff --git a/srcpkgs/postgresql17/template b/srcpkgs/postgresql17/template index b959c2f4210..c9bc441b6b1 100644 --- a/srcpkgs/postgresql17/template +++ b/srcpkgs/postgresql17/template @@ -22,7 +22,6 @@ homepage="https://www.postgresql.org" changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html" distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2" checksum=c4605b73fea11963406699f949b966e5d173a7ee0ccaef8938dec0ca8a995fe7 -make_check=ci-skip # Postgres server can't be run as root conf_files=" /${_sysconfdir}/default/postgresql diff --git a/srcpkgs/python3-Twisted/template b/srcpkgs/python3-Twisted/template index a3a6be8c2d8..fa3a8566169 100644 --- a/srcpkgs/python3-Twisted/template +++ b/srcpkgs/python3-Twisted/template @@ -19,7 +19,6 @@ homepage="https://twisted.org/" changelog="https://raw.githubusercontent.com/twisted/twisted/trunk/NEWS.rst" distfiles="${PYPI_SITE}/t/twisted/twisted-${version}.tar.gz" checksum=5a60147f044187a127ec7da96d170d49bcce50c6fd36f594e60f4587eff4d394 -make_check=ci-skip # some tests fail when running as root alternatives=" twisted:cftp:/usr/bin/cftp3 diff --git a/srcpkgs/python3-send2trash/template b/srcpkgs/python3-send2trash/template index 423fce83b1e..460ab4afb60 100644 --- a/srcpkgs/python3-send2trash/template +++ b/srcpkgs/python3-send2trash/template @@ -14,13 +14,6 @@ changelog="https://raw.githubusercontent.com/arsenetar/send2trash/master/CHANGES distfiles="${PYPI_SITE}/S/Send2Trash/Send2Trash-${version}.tar.gz" checksum=b18e7a3966d99871aefeb00cfbcfdced55ce4871194810fc71f4aa484b953abf -if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then - # this test fails on CI (due to root) - make_check_args=" - --deselect=tests/test_plat_other.py::test_trash_topdir_failure - " -fi - post_install() { vlicense LICENSE } diff --git a/srcpkgs/sheldon/template b/srcpkgs/sheldon/template index e240da40eee..38e74464842 100644 --- a/srcpkgs/sheldon/template +++ b/srcpkgs/sheldon/template @@ -15,10 +15,6 @@ changelog="https://raw.githubusercontent.com/rossmacarthur/sheldon/trunk/RELEASE distfiles="https://github.com/rossmacarthur/sheldon/archive/refs/tags/${version}.tar.gz" checksum=fa0aade40a2e2f397f5f8734a0bc28391147ed6ad75c087f8ab7db7ce1e49b88 -if [ "$XBPS_BUILD_ENVIRONMENT" == "void-packages-ci" ]; then - make_check_args="-- --skip lock_and_source_clean_permission_denied" -fi - post_install() { for shell in bash fish zsh; do vtargetrun ${DESTDIR}/usr/bin/sheldon completions --shell ${shell} > sheldon.${shell} diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template index 7bdd3247b47..50d82d120f7 100644 --- a/srcpkgs/subversion-kwallet-auth/template +++ b/srcpkgs/subversion-kwallet-auth/template @@ -46,12 +46,6 @@ pre_configure() { else configure_args+=" --with-apxs" fi - - if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then - # This test will fail when run as the root user, - # because flock() will ignore file permissions. - vsed -i subversion/tests/libsvn_fs/locks-test.c -e '/SVN_TEST_OPTS_PASS(obtain_write_lock_failure,/,+3d' - fi } do_install() { diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template index 6b6cea450e5..3d320088640 100644 --- a/srcpkgs/subversion/template +++ b/srcpkgs/subversion/template @@ -59,12 +59,6 @@ pre_configure() { else configure_args+=" --with-apxs" fi - - if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then - # This test will fail when run as the root user, - # because flock() will ignore file permissions. - vsed -i subversion/tests/libsvn_fs/locks-test.c -e '/SVN_TEST_OPTS_PASS(obtain_write_lock_failure,/,+3d' - fi } post_configure() { diff --git a/srcpkgs/trash-cli/template b/srcpkgs/trash-cli/template index c711e724949..5517756541d 100644 --- a/srcpkgs/trash-cli/template +++ b/srcpkgs/trash-cli/template @@ -15,5 +15,3 @@ homepage="https://github.com/andreafrancia/trash-cli" changelog="https://raw.githubusercontent.com/andreafrancia/trash-cli/master/HISTORY.txt" distfiles="https://github.com/andreafrancia/trash-cli/archive/refs/tags/${version}.tar.gz" checksum=1d7dec1ad8f0264ceb1b0211d25fffee99c9409cd2e1d36dcc82ac5540f39ce5 -# Can not be run as root -make_check=ci-skip diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template index 5082f5c74f4..03aa5734d21 100644 --- a/srcpkgs/txr/template +++ b/srcpkgs/txr/template @@ -34,9 +34,6 @@ pre_check() { if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then # IPv6 not supported in github CI vsed -i -e 's/,\*maybe-ipv6//' tests/014/dgram-stream.tl - - # Removing tests that fail when run as root - rm tests/019/load-search.tl fi }