From: Ralf Wildenhues Date: Tue, 9 Sep 2008 17:45:25 +0000 (+0200) Subject: fix minor shell issues in test suite X-Git-Tag: v7.0~52 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9dcebc51be915fb6d0ab2eca36168f3ab12a45c7;p=platform%2Fupstream%2Fcoreutils.git fix minor shell issues in test suite * tests/misc/help-version: Fix bad quoting. * tests/cp/same-file: Fix unportable shell quoting. * tests/mv/part-symlink: Likewise. --- diff --git a/tests/cp/same-file b/tests/cp/same-file index 32bdc2a..58b8fba 100755 --- a/tests/cp/same-file +++ b/tests/cp/same-file @@ -110,10 +110,10 @@ for args in 'foo symlink' 'symlink foo' 'foo foo' 'sl1 sl2' 'foo hardlink'; do ' _err fi # Strip off all but the file names. - ls="`ls -gG --ignore=_err . \ + ls=`ls -gG --ignore=_err . \ | sed \ -e '/^total /d' \ - -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//'`" + -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//'` echo "($ls)" # Make sure the original is unchanged and that # the destination is a copy. diff --git a/tests/misc/help-version b/tests/misc/help-version index c7bec35..ee74600 100755 --- a/tests/misc/help-version +++ b/tests/misc/help-version @@ -51,8 +51,8 @@ for lang in C fr da; do # false fails even when invoked with --help or --version. if test $i = false; then - env LC_MESSAGES=$lang $i" --help >/dev/null && fail=1 - env LC_MESSAGES=$lang $i" --version >/dev/null && fail=1 + env LC_MESSAGES=$lang $i --help >/dev/null && fail=1 + env LC_MESSAGES=$lang $i --version >/dev/null && fail=1 continue fi diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink index 2aed4d8..2318f16 100755 --- a/tests/mv/part-symlink +++ b/tests/mv/part-symlink @@ -99,18 +99,18 @@ for copy in cp mv; do } # Strip off all but the file names. # Remove any site-dependent part of each file name. - ls="`ls -gG --ignore=.err . \ + ls=`ls -gG --ignore=.err . \ | sed \ -e '/^total /d' \ -e s,$other_partition_tmpdir/,, \ -e "s,$pwd_tmp/,," \ - -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//'`" - ls2="`cd $other_partition_tmpdir && ls -gG --ignore=.err . \ + -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//'` + ls2=`cd $other_partition_tmpdir && ls -gG --ignore=.err . \ | sed \ -e '/^total /d' \ -e s,$other_partition_tmpdir/,, \ -e "s,$pwd_tmp/,," \ - -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//'`" + -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//'` echo "($ls) ($ls2)" # If the command failed, then it must not have changed the files.