5f6efa04bf
The fix for CVE was done so that different architectures or memory limits give different cpio output; but all possible error ouputs are OK and expected. Firstly, the testsuite fail was observed on ppc64 architecture, thanks dhorak for quick ping. Related: #1167573 Version: 2.11-32
30 lines
841 B
Diff
30 lines
841 B
Diff
diff --git a/tests/symlink-bad-length.at b/tests/symlink-bad-length.at
|
|
index cbf4aa7..f8f60e3 100644
|
|
--- a/tests/symlink-bad-length.at
|
|
+++ b/tests/symlink-bad-length.at
|
|
@@ -37,13 +37,19 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
|
|
|
|
AT_CHECK([
|
|
base64 -d ARCHIVE.base64 > ARCHIVE || AT_SKIP_TEST
|
|
-cpio -ntv < ARCHIVE
|
|
-test $? -eq 2
|
|
+TZ=UTC cpio -ntv < ARCHIVE 2>stderr
|
|
+rc=$?
|
|
+cat stderr | grep -v \
|
|
+ -e 'stored filename length is out of range' \
|
|
+ -e 'premature end of file' \
|
|
+ -e 'memory exhausted' \
|
|
+ >&2
|
|
+echo >&2 STDERR
|
|
+test "$rc" -ne 0
|
|
],
|
|
[0],
|
|
-[-rw-rw-r-- 1 10029 10031 13 Nov 25 13:52 FILE
|
|
-],[cpio: LINK: stored filename length is out of range
|
|
-cpio: premature end of file
|
|
+[-rw-rw-r-- 1 10029 10031 13 Nov 25 11:52 FILE
|
|
+],[STDERR
|
|
])
|
|
|
|
AT_CLEANUP
|