mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-15 05:03:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

ltp: file01: Fix in was not recognized

Browse Source 
Some file has "pie" appending after LSB or MSB, which causes mismatch and the
following error.

"file01 10 TFAIL: in: was not recognized"
..."ELF 64-bit LSB pie executable"...

This patches tunes the regulation expression to include those cases.

(From OE-Core rev: 3602a7affd95a22e7e22c9ed4df731f94ed9b64b)

Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
He Zhe
2019-04-22 16:55:39 +08:00
committed by Richard Purdie
parent 6fcc6e5ab2
commit 26f7e4e660
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
meta/recipes-extended/ltp/ltp/0001-file01.sh-Fix-in-was-not-recognized.patch Normal file
View File

@@ -0,0 +1,38 @@
From 974e9b862e503c50501079e6586f81918e94a849 Mon Sep 17 00:00:00 2001
From: He Zhe <zhe.he@windriver.com>
Date: Fri, 19 Apr 2019 17:57:48 +0800
Subject: [PATCH] file01.sh: Fix in was not recognized
Some file has "pie" appending after LSB or MSB, which causes mismatch and the
following error.
"file01 10 TFAIL: in: was not recognized"
..."ELF 64-bit LSB pie executable"...
This patches tunes the regulation expression to include those cases.
Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2019-April/011758.html]
Signed-off-by: He Zhe <zhe.he@windriver.com>
---
testcases/commands/file/file01.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/testcases/commands/file/file01.sh b/testcases/commands/file/file01.sh
index 0a8119e..55c0433 100755
--- a/testcases/commands/file/file01.sh
+++ b/testcases/commands/file/file01.sh
@@ -91,7 +91,9 @@ do_test()
9) file_test in.m4 "M4 macro processor script, ASCII text" \
"ASCII M4 macro language pre-processor text";;
10) file_test in "ELF .*-bit $TEST_ARCH executable, .*" \
- "ELF .*-bit $TEST_ARCH shared object, .*";;
+ "ELF .*-bit $TEST_ARCH shared object, .*" \
+ "ELF .*-bit $TEST_ARCH pie executable, .*" \
+ "ELF .*-bit $TEST_ARCH pie shared object, .*";;
11) file_test in.ar "current ar archive";;
12) file_test in.tar "tar archive";;
13) file_test in.tar.gz "gzip compressed data, .*";;
--
2.7.4

3
meta/recipes-extended/ltp/ltp_20190115.bb
View File

@@ -51,7 +51,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://setregid01-security-string-formatting.patch \
file://0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch \
file://0001-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch \
file://0001-diotest4-Let-kernel-pick-an-address-when-calling-mma.patch\
file://0001-diotest4-Let-kernel-pick-an-address-when-calling-mma.patch \
file://0001-file01.sh-Fix-in-was-not-recognized.patch \
"
S = "${WORKDIR}/git"