From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xiao Yang Date: Thu, 9 May 2019 12:36:03 +0800 Subject: [LTP] [PATCH v2] file01.sh: Fix in was not recognized In-Reply-To: <04eacb36-fde2-1468-68f7-23b6d146a5f3@windriver.com> References: <1555922118-412699-1-git-send-email-zhe.he@windriver.com> <5CBD8D83.4080901@cn.fujitsu.com> <04eacb36-fde2-1468-68f7-23b6d146a5f3@windriver.com> Message-ID: <5CD3AE33.1080202@cn.fujitsu.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: ltp@lists.linux.it Hi Zhe, I am sorry for the late reply. Thanks for your pacth and pushed. BTW: I try to think about simplifying all keywords by extended regular expression. (e.g. use (pie )? to match your encountered keywords). Best Regards, Xiao Yang On 2019/04/22 17:53, He Zhe wrote: > > On 4/22/19 5:46 PM, Xiao Yang wrote: >> On 2019/04/22 16:35, zhe.he@windriver.com wrote: >>> From: He Zhe >>> >>> 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 >>> --- >>> v1 to v2: split into two groups to just match the encountered case >>> >>> 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, .*";; >> Hi He, >> >> Perhap, it's simpler to use the ‘.*’regexp directly as your first patch does: >> ----------------------------------------------------------------------- >> >> - 10) file_test in "ELF .*-bit $TEST_ARCH executable, .*" \ >> - "ELF .*-bit $TEST_ARCH shared object, .*";; >> + 10) file_test in "ELF .*-bit $TEST_ARCH .*executable, .*" \ >> + "ELF .*-bit $TEST_ARCH .*shared object, .*";; >> >> ----------------------------------------------------------------------- > Not exactly, now it can match 4 different cases. > > Zhe > >> Best Regards, >> Xiao Yang >>> 11) file_test in.ar "current ar archive";; >>> 12) file_test in.tar "tar archive";; >>> 13) file_test in.tar.gz "gzip compressed data, .*";; >> >> >> > > > . >