diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2015-12-01 10:13:55 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-12 23:31:41 +0000 |
| commit | 7e2f2bc55a1b367503ab75ac6863f56d662c34cc (patch) | |
| tree | e747230f2fe931dabe05ac7d014a2055a77223e8 | |
| parent | cbda522698fb372023bdda556694ccac2af803b7 (diff) | |
| download | openembedded-core-7e2f2bc55a1b367503ab75ac6863f56d662c34cc.tar.gz openembedded-core-7e2f2bc55a1b367503ab75ac6863f56d662c34cc.tar.bz2 openembedded-core-7e2f2bc55a1b367503ab75ac6863f56d662c34cc.zip | |
cpio: fix test case of symlink-bad-length
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-extended/cpio/cpio-2.11/0001-fix-testcase-of-symlink-bad-length.patch | 57 | ||||
| -rw-r--r-- | meta/recipes-extended/cpio/cpio_2.11.bb | 1 |
2 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-extended/cpio/cpio-2.11/0001-fix-testcase-of-symlink-bad-length.patch b/meta/recipes-extended/cpio/cpio-2.11/0001-fix-testcase-of-symlink-bad-length.patch new file mode 100644 index 0000000000..642f557ac8 --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.11/0001-fix-testcase-of-symlink-bad-length.patch @@ -0,0 +1,57 @@ +Upstream-Status: Backport + +Subject: fix testcase of symlink-bad-length + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + tests/symlink-bad-length.at | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/tests/symlink-bad-length.at b/tests/symlink-bad-length.at +index 74208ce..11fc6ce 100644 +--- a/tests/symlink-bad-length.at ++++ b/tests/symlink-bad-length.at +@@ -1,5 +1,5 @@ + # Process this file with autom4te to create testsuite. -*- Autotest -*- +-# Copyright (C) 2014 Free Software Foundation, Inc. ++# Copyright (C) 2014-2015 Free Software Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -35,14 +35,30 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + ]) + ++# The exact error message and exit status depend on the host architecture, ++# therefore strderr is filtered out and error code is not checked. ++ ++# So far the only case when cpio would exit with code 0 is when it skips ++# several bytes and encounters a valid record header. Perhaps it should ++# exit with code 2 (non-critical error), if at least one byte was skipped, ++# but that could hurt backward compatibility. ++ + AT_CHECK([ + base64 -d ARCHIVE.base64 > ARCHIVE || AT_SKIP_TEST +-cpio -ntv < ARCHIVE +-test $? -eq 2 ++TZ=UTC cpio -ntv < ARCHIVE 2>stderr ++cat stderr | grep -v \ ++ -e 'stored filename length is out of range' \ ++ -e 'premature end of file' \ ++ -e 'archive header has reverse byte-order' \ ++ -e 'memory exhausted' \ ++ -e 'skipped [[0-9][0-9]*] bytes of junk' \ ++ -e '[[0-9][0-9]*] block' \ ++ >&2 ++echo >&2 STDERR + ], + [0], + [-rw-rw-r-- 1 10029 10031 13 Nov 25 2014 FILE +-],[cpio: premature end of file ++],[STDERR + ]) + + AT_CLEANUP +-- +1.9.1 + diff --git a/meta/recipes-extended/cpio/cpio_2.11.bb b/meta/recipes-extended/cpio/cpio_2.11.bb index 3df1cd5bed..9a6a50e8b8 100644 --- a/meta/recipes-extended/cpio/cpio_2.11.bb +++ b/meta/recipes-extended/cpio/cpio_2.11.bb @@ -11,6 +11,7 @@ SRC_URI += "file://remove-gets.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 \ + file://0001-fix-testcase-of-symlink-bad-length.patch \ " SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c" |