[v2] ltp: file01: Fix in was not recognized

Submitted by zhe.he@windriver.com on April 22, 2019, 8:55 a.m. | Patch ID: 160575

Details

Message ID 1555923339-440174-1-git-send-email-zhe.he@windriver.com
State New
Headers show

Commit Message

zhe.he@windriver.com April 22, 2019, 8:55 a.m.
From: He Zhe <zhe.he@windriver.com>

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.

Signed-off-by: He Zhe <zhe.he@windriver.com>
---
v1 to v2: Move Upstream-Status to right place

 .../0001-file01.sh-Fix-in-was-not-recognized.patch | 38 ++++++++++++++++++++++
 meta/recipes-extended/ltp/ltp_20190115.bb          |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 meta/recipes-extended/ltp/ltp/0001-file01.sh-Fix-in-was-not-recognized.patch

Patch hide | download patch | download mbox

diff --git a/meta/recipes-extended/ltp/ltp/0001-file01.sh-Fix-in-was-not-recognized.patch b/meta/recipes-extended/ltp/ltp/0001-file01.sh-Fix-in-was-not-recognized.patch
new file mode 100644
index 0000000..5cd9e08
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-file01.sh-Fix-in-was-not-recognized.patch
@@ -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
+
diff --git a/meta/recipes-extended/ltp/ltp_20190115.bb b/meta/recipes-extended/ltp/ltp_20190115.bb
index 1d0c00b..a9e025a 100644
--- a/meta/recipes-extended/ltp/ltp_20190115.bb
+++ b/meta/recipes-extended/ltp/ltp_20190115.bb
@@ -50,6 +50,7 @@  SRC_URI = "git://github.com/linux-test-project/ltp.git \
            file://define-sigrtmin-and-sigrtmax-for-musl.patch \
            file://setregid01-security-string-formatting.patch \
            file://0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch \
+           file://0001-file01.sh-Fix-in-was-not-recognized.patch \
            "
 
 S = "${WORKDIR}/git"

Comments

zhe.he@windriver.com July 2, 2019, 7:33 a.m.
Kindly ping.

Zhe

On 4/22/19 4:55 PM, zhe.he@windriver.com wrote:
> From: He Zhe <zhe.he@windriver.com>
>
> 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.
>
> Signed-off-by: He Zhe <zhe.he@windriver.com>
> ---
> v1 to v2: Move Upstream-Status to right place
>
>  .../0001-file01.sh-Fix-in-was-not-recognized.patch | 38 ++++++++++++++++++++++
>  meta/recipes-extended/ltp/ltp_20190115.bb          |  1 +
>  2 files changed, 39 insertions(+)
>  create mode 100644 meta/recipes-extended/ltp/ltp/0001-file01.sh-Fix-in-was-not-recognized.patch
>
> diff --git a/meta/recipes-extended/ltp/ltp/0001-file01.sh-Fix-in-was-not-recognized.patch b/meta/recipes-extended/ltp/ltp/0001-file01.sh-Fix-in-was-not-recognized.patch
> new file mode 100644
> index 0000000..5cd9e08
> --- /dev/null
> +++ b/meta/recipes-extended/ltp/ltp/0001-file01.sh-Fix-in-was-not-recognized.patch
> @@ -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
> +
> diff --git a/meta/recipes-extended/ltp/ltp_20190115.bb b/meta/recipes-extended/ltp/ltp_20190115.bb
> index 1d0c00b..a9e025a 100644
> --- a/meta/recipes-extended/ltp/ltp_20190115.bb
> +++ b/meta/recipes-extended/ltp/ltp_20190115.bb
> @@ -50,6 +50,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
>             file://define-sigrtmin-and-sigrtmax-for-musl.patch \
>             file://setregid01-security-string-formatting.patch \
>             file://0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch \
> +           file://0001-file01.sh-Fix-in-was-not-recognized.patch \
>             "
>  
>  S = "${WORKDIR}/git"