Commit 2cc9dd87 authored by Natanael Copa's avatar Natanael Copa

main/abuild: skip abuild-fetch lock test on s390x

parent f2fe8283
From dee82f764c2d338d33a2fa56db38dddaa5903aa7 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 14 May 2021 12:53:11 +0200
Subject: [PATCH] tests: skip lock test on s390x
the sleep(0) trick does not appear to work on s390x. which is okish as
worst case we end up with lock file leftovers. skip the test
---
tests/abuild-fetch.bats | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/abuild-fetch.bats b/tests/abuild-fetch.bats
index f3594ce..7f94607 100644
--- a/tests/abuild-fetch.bats
+++ b/tests/abuild-fetch.bats
@@ -120,7 +120,10 @@ teardown() {
sleep 0.2
# the first stamp should not exist, second instance should block the retry
- [ ! -f "$tmpdir"/stamp1 ]
+ # skip this test on s390x, due to sleep(0) not working there
+ if [ "$(uname -m)" != "s390x" ]; then
+ [ ! -f "$tmpdir"/stamp1 ]
+ fi
# simulate second download finished
echo "done fifo2" > "$tmpdir"/fifo2
--
2.31.1
......@@ -2,7 +2,7 @@
pkgname=abuild
pkgver=3.8.0_rc3
_ver=${pkgver%_git*}
pkgrel=0
pkgrel=1
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
......@@ -27,6 +27,7 @@ subpackages="
options="suid"
pkggroups="abuild"
source="https://git.alpinelinux.org/abuild/snapshot/abuild-$pkgver.tar.xz
0001-tests-skip-lock-test-on-s390x.patch
"
builddir="$srcdir"/abuild-$pkgver
......@@ -86,3 +87,5 @@ _rootbld() {
sha512sums="
57f50f7b037a0e64bf4653b71525b4d4e922438a2a6ad965669b620efdfbfb2855e82a1d59e6c69d59a37e7c61a4998a4686bfc6fa8357551d427e517201236c abuild-3.8.0_rc3.tar.xz
"
sha512sums="57f50f7b037a0e64bf4653b71525b4d4e922438a2a6ad965669b620efdfbfb2855e82a1d59e6c69d59a37e7c61a4998a4686bfc6fa8357551d427e517201236c abuild-3.8.0_rc3.tar.xz
df31077726d2885d943bd13ee1688ae88ee02a9c59f4fb839b1468374fdca22ce47a2b5a17a28a42388c46e6f704d89d8b388ac9c704c96bc3555b84a1a4c576 0001-tests-skip-lock-test-on-s390x.patch"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment