forked from pool/coreutils
77474cd407
- Testsuite: avoid a failure of tests/mkdir/p-acl.sh on armv7l. - Refresh patches with QUILT_REFRESH_ARGS="-p0 --no-timestamps" OBS-URL: https://build.opensuse.org/request/show/215037 OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=223
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From 84e67a5bd239179e2faded424861dce5718fa12c Mon Sep 17 00:00:00 2001
|
|
From: Bernhard Voelker <mail@bernhard-voelker.de>
|
|
Date: Tue, 7 Jan 2014 19:18:25 +0100
|
|
Subject: [PATCH] tests: avoid FP failure when cp fails for /proc/cpuinfo
|
|
|
|
On aarch64, cp fails to copy /proc/cpuinfo because the inode number
|
|
seems to change between the initial stat() call and copying the file:
|
|
|
|
$ cp /proc/cpuinfo exp
|
|
cp: skipping file '/proc/cpuinfo', as it was \
|
|
replaced while being copied
|
|
|
|
* tests/cp/proc-zero-len.sh: When cp fails, check on the above
|
|
error message to skip the test.
|
|
---
|
|
tests/cp/proc-zero-len.sh | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
Index: tests/cp/proc-zero-len.sh
|
|
===================================================================
|
|
--- tests/cp/proc-zero-len.sh.orig
|
|
+++ tests/cp/proc-zero-len.sh
|
|
@@ -27,7 +27,12 @@ test -r $f || f=empty
|
|
cat $f > out || fail=1
|
|
|
|
# With coreutils-6.9, this would create a zero-length "exp" file.
|
|
-cp $f exp || fail=1
|
|
+# Skip this test on architectures like aarch64 where the inode
|
|
+# number of the file changed during the cp run.
|
|
+cp $f exp 2>err \
|
|
+ || { fail=1;
|
|
+ grep 'replaced while being copied' \
|
|
+ && skip_ "File $f is being replaced while being copied"; }
|
|
|
|
# Don't simply compare contents; they might differ,
|
|
# e.g., if CPU freq changes between cat and cp invocations.
|