From 94593799f7deab90dae163f323f76ca1a987ab03 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 27 Jun 2018 13:15:10 +0200 Subject: [PATCH] testsuite/bzcat.tests: fix false positive take 2 Signed-off-by: Denys Vlasenko --- testsuite/bzcat.tests | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/testsuite/bzcat.tests b/testsuite/bzcat.tests index 8210d94d4..ad05dcb2c 100755 --- a/testsuite/bzcat.tests +++ b/testsuite/bzcat.tests @@ -30,10 +30,11 @@ hello_bz2() { $ECHO -ne "\x17\x72\x45\x38\x50\x90\x5b\xb8\xe8\xa3" } +test x"$CONFIG_ZCAT" = x"y" && \ for ext in \ - `test x"$CONFIG_GUNZIP:$CONFIG_FEATURE_SEAMLESS_GZ" = x"y:y" && echo gz` \ - `test x"$CONFIG_BUNZIP2:$CONFIG_FEATURE_SEAMLESS_BZ2" = x"y:y" && echo bz2` \ - `test x"$CONFIG_UNCOMPRESS:$CONFIG_FEATURE_SEAMLESS_Z" = x"y:y" && echo Z` + `test x"$CONFIG_FEATURE_SEAMLESS_GZ" = x"y" && echo gz` \ + `test x"$CONFIG_FEATURE_SEAMLESS_BZ2" = x"y" && echo bz2` \ + `test x"$CONFIG_FEATURE_SEAMLESS_Z" = x"y" && echo Z` do prep() { rm -f t1.$ext t2.$ext t_actual @@ -97,7 +98,7 @@ testing "bzcat can handle compressed zero-length bzip2 files" \ ## compress algorithm # "input" file is compressed (.Z) file with "a\n" data -test x"$CONFIG_UNCOMPRESS" = x"y" && \ +test x"$CONFIG_ZCAT" = x"y" && \ test x"$CONFIG_FEATURE_SEAMLESS_Z" = x"y" && \ testing "zcat can print many files" \ "zcat input input; echo \$?" \ @@ -110,7 +111,7 @@ a " "" # "input" file is compressed (.Z) zero byte file -test x"$CONFIG_UNCOMPRESS" = x"y" && \ +test x"$CONFIG_ZCAT" = x"y" && \ test x"$CONFIG_FEATURE_SEAMLESS_Z" = x"y" && \ testing "zcat can handle compressed zero-length (.Z) files" \ "zcat input input; echo \$?" \