diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2021-01-14 18:51:03 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2021-01-15 10:15:12 +0000 |
| commit | b8f4858017e1951b38a9264ee93ce21a345d017d (patch) | |
| tree | 0e124d7cd8f680e7b632af4aeadaa8963a97b055 | |
| parent | 9309be0bae63cc7a2e20011d6a3aad8cb482db6d (diff) | |
| download | aports-b8f4858017e1951b38a9264ee93ce21a345d017d.tar.gz aports-b8f4858017e1951b38a9264ee93ce21a345d017d.tar.bz2 aports-b8f4858017e1951b38a9264ee93ce21a345d017d.tar.xz | |
main/libuv: restore checks
| -rw-r--r-- | main/libuv/APKBUILD | 30 | ||||
| -rw-r--r-- | main/libuv/disable-test-failing-on-builders.patch | 20 |
2 files changed, 6 insertions, 44 deletions
diff --git a/main/libuv/APKBUILD b/main/libuv/APKBUILD index 67c685d97d..311c9d6cb7 100644 --- a/main/libuv/APKBUILD +++ b/main/libuv/APKBUILD @@ -3,18 +3,17 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libuv pkgver=1.40.0 -pkgrel=0 +pkgrel=1 pkgdesc="Cross-platform asychronous I/O" -url="https://libuv.org" +url="https://libuv.org/" arch="all" license="MIT AND ISC" makedepends_build="automake autoconf libtool" makedepends_host="linux-headers" subpackages="$pkgname-static $pkgname-dev $pkgname-dbg" -source="https://dist.libuv.org/dist/v$pkgver/libuv-v$pkgver.tar.gz - disable-test-failing-on-builders.patch - " +source="https://dist.libuv.org/dist/v$pkgver/libuv-v$pkgver.tar.gz" builddir="$srcdir/$pkgname-v$pkgver" +[ "$CARCH" = "s390x" ] && options="!check" # failing tests # secfixes: # 1.39.0-r0: @@ -37,23 +36,7 @@ build() { } check() { - case $CARCH in - # See https://github.com/libuv/libuv/issues/2307 - x86*) - if test $DRONE; then - sed -i "s/TEST_.*(ipc_closed_handle)//g" test/test-list.h - fi - make check - ;; - # FIXME: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/9366 - # See https://github.com/libuv/libuv/issues/2468 - s390x) - make check || true # ignore failure - ;; - *) - make check - ;; - esac + make check } package() { @@ -62,5 +45,4 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -sha512sums="400a567f4695569c9dfa3916d1d7d8c68344bdb36a83af0567b51d084163457a5deaaba17bc7162907d7138600cd246722190801c7370e31311e67bfbaf8cc57 libuv-v1.40.0.tar.gz -0d155259cfaa78fd229a015fd7181b9a76bf4618e36e6e9d4697323cddcde42f29598f161f6831489ec31adc5cf2614cb670021bf6f5ede7202bcbad7f675fbb disable-test-failing-on-builders.patch" +sha512sums="400a567f4695569c9dfa3916d1d7d8c68344bdb36a83af0567b51d084163457a5deaaba17bc7162907d7138600cd246722190801c7370e31311e67bfbaf8cc57 libuv-v1.40.0.tar.gz" diff --git a/main/libuv/disable-test-failing-on-builders.patch b/main/libuv/disable-test-failing-on-builders.patch deleted file mode 100644 index 35007b4006..0000000000 --- a/main/libuv/disable-test-failing-on-builders.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/test/test-list.h b/test/test-list.h -index a6cfc6b..613dc95 100644 ---- a/test/test-list.h -+++ b/test/test-list.h -@@ -146,7 +146,6 @@ TEST_DECLARE (udp_send_hang_loop) - TEST_DECLARE (udp_send_immediate) - TEST_DECLARE (udp_send_unreachable) - TEST_DECLARE (udp_multicast_join) --TEST_DECLARE (udp_multicast_join6) - TEST_DECLARE (udp_multicast_ttl) - TEST_DECLARE (udp_multicast_interface) - TEST_DECLARE (udp_multicast_interface6) -@@ -679,7 +678,6 @@ TASK_LIST_START - TEST_ENTRY (udp_multicast_interface) - TEST_ENTRY (udp_multicast_interface6) - TEST_ENTRY (udp_multicast_join) -- TEST_ENTRY (udp_multicast_join6) - TEST_ENTRY (udp_multicast_ttl) - TEST_ENTRY (udp_try_send) - |