cpio: fix testcase symlink-bad-lengths [ LIN8-947 ]

* fix the output of stderr & stdout to meet latest cpio

(From OE-Core rev: 80d12c734ad0c1d86ee5b0c6639c4e840dc6dfad)

Signed-off-by: Jun Zhang <jun.zhang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jun Zhang
2015-10-19 17:41:55 +08:00
committed by Richard Purdie
parent bceb9cb5b4
commit 0f516a55fa
2 changed files with 34 additions and 0 deletions

View File

@@ -0,0 +1,33 @@
From c213ffa2e0ba6677e0dfade9c67b91446c70c8bd Mon Sep 17 00:00:00 2001
From: Jun Zhang <jun.zhang@windriver.com>
Date: Fri, 16 Oct 2015 21:25:17 +0800
Subject: [PATCH] cpio: fix testcase symlink-bad-lengths
* fix the output of stderr & stdout to meet latest cpio
Upstream-Status: Pending
Signed-off-by: Jun Zhang <jun.zhang@windriver.com>
---
tests/symlink-bad-length.at | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tests/symlink-bad-length.at b/tests/symlink-bad-length.at
index 6f804b1..74208ce 100644
--- a/tests/symlink-bad-length.at
+++ b/tests/symlink-bad-length.at
@@ -41,9 +41,8 @@ cpio -ntv < ARCHIVE
test $? -eq 2
],
[0],
-[-rw-rw-r-- 1 10029 10031 13 Nov 25 13:52 FILE
-],[cpio: LINK: stored filename length too big
-cpio: premature end of file
+[-rw-rw-r-- 1 10029 10031 13 Nov 25 2014 FILE
+],[cpio: premature end of file
])
AT_CLEANUP
--
1.9.1

View File

@@ -10,6 +10,7 @@ SRC_URI += "file://remove-gets.patch \
file://cpio-CVE-2015-1197.patch \
file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
file://Fix-symlink-bad-length-test-for-64-bit-architectures.patch \
file://fix-testcase-symlink-bad-lengths.patch \
"
SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c"