summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2022-12-26 14:55:08 +0000
committerZach van Rijn <me@zv.io>2022-12-26 14:55:47 +0000
commite9ea939bc00ecf49a7bffd4d2253cba2c6726210 (patch)
tree961374e2e4bb51be6d9eb6c3f02c5d338b81cd33
parent43876dee9f4316dea1f9a2e0df6e9b0bffb226d2 (diff)
downloadpackages-e9ea939bc00ecf49a7bffd4d2253cba2c6726210.tar.gz
packages-e9ea939bc00ecf49a7bffd4d2253cba2c6726210.tar.bz2
packages-e9ea939bc00ecf49a7bffd4d2253cba2c6726210.tar.xz
packages-e9ea939bc00ecf49a7bffd4d2253cba2c6726210.zip
system/coreutils: patch test assumption. fixes #943.
-rw-r--r--system/coreutils/APKBUILD4
-rw-r--r--system/coreutils/tests-cp-proc-short-read.patch15
2 files changed, 18 insertions, 1 deletions
diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD
index 949cde440..40d6c9faf 100644
--- a/system/coreutils/APKBUILD
+++ b/system/coreutils/APKBUILD
@@ -21,6 +21,7 @@ source="https://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz
gnulib-test-fixes.patch
localename-test-fix.patch
test-df-symlink-bindmount.patch
+ tests-cp-proc-short-read.patch
"
[ "${CBUILD}" != "${CHOST}" ] && source="$source
051_all_coreutils-mangen.patch
@@ -74,7 +75,8 @@ bd8b5cecba59eba30458c8afa895877d39a987b989bc06b70cd6836e0ef684677aaadcb4949b58a7
fd97fccd661befc558b3afb3e32c82dd2cef511a05e6129d49540599297c1b59ab1f109e63a12f585a2348c26c28fb98330c348829d1fe61cf8149d0dd1c989c gnulib-tests-dont-require-gpg-passphrase.patch
eaba7ad1c5b43d25dc96baaf6f01be5976f9f64c26ea55e1c78d6a3f12825f2f0e998aae7f2ad6d9b2637a3d11586ffe21b87fbbd3c1bb6c9898c5963cb2a32c gnulib-test-fixes.patch
b1509e5678a05f24d6e764c047546e5e34a7fbd5edb59c7debedb144a0096d8ac247c7e2722a5f68c90751e5280bec743c9a6ed3e1433c1916294d68d7bca109 localename-test-fix.patch
-43bb4cb8a330dc785ff8f09685e4fb2879df49b6944e2f64f9fa34a36740f392b115b3af57d481703690b9ee6c6f48ffb385b35cd128b1b40955f69dbd68bb3d test-df-symlink-bindmount.patch"
+43bb4cb8a330dc785ff8f09685e4fb2879df49b6944e2f64f9fa34a36740f392b115b3af57d481703690b9ee6c6f48ffb385b35cd128b1b40955f69dbd68bb3d test-df-symlink-bindmount.patch
+7dfc5d37cc22c06c88a027102482b33f46a962b6f71d9adb80225d8f68d0be0760894e4480c3f80018a4f725bb7d0779987a6d28bceb7e141e01dbad78f84c2d tests-cp-proc-short-read.patch"
[ "${CBUILD}" != "${CHOST}" ] && sha512sums="
bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36 051_all_coreutils-mangen.patch
"
diff --git a/system/coreutils/tests-cp-proc-short-read.patch b/system/coreutils/tests-cp-proc-short-read.patch
new file mode 100644
index 000000000..33f0417d8
--- /dev/null
+++ b/system/coreutils/tests-cp-proc-short-read.patch
@@ -0,0 +1,15 @@
+diff --git a/tests/cp/proc-short-read.sh b/tests/cp/proc-short-read.sh
+index bedb08e06..89dba8d3d 100755
+--- a/tests/cp/proc-short-read.sh
++++ b/tests/cp/proc-short-read.sh
+@@ -28,8 +28,8 @@ cp $proc_large 1 || fail=1
+ cat $proc_large > 2 || fail=1
+
+ # adjust varying parts
+-sed '/MHz/d; /bogomips/d;' 1 > proc.cp || framework_failure_
+-sed '/MHz/d; /bogomips/d;' 2 > proc.cat || framework_failure_
++sed '/MHz/d; /[Bb][Oo][Gg][Oo][Mm][Ii][Pp][Ss]/d;' 1 > proc.cp || framework_failure_
++sed '/MHz/d; /[Bb][Oo][Gg][Oo][Mm][Ii][Pp][Ss]/d;' 2 > proc.cat || framework_failure_
+
+ compare proc.cp proc.cat || fail=1
+