summaryrefslogtreecommitdiff
path: root/tests/readlink
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2012-04-03 20:32:44 +0200
committerJim Meyering <meyering@redhat.com>2012-04-04 12:20:56 +0200
commite43d30eab3215bc9ff49ec7db3d3e2baa95ba070 (patch)
treeb3828ca5bdc794f9b8648af1996d2863663c8590 /tests/readlink
parent64ecea53d9b4c1ecbf6d02ff8c4ae98b3a82e9a2 (diff)
downloadcoreutils-e43d30eab3215bc9ff49ec7db3d3e2baa95ba070.tar.xz
tests: convert nearly all `...` expressions to $(...)
Exempt init.sh because it runs before we're assured to have a shell that groks $(...). Exempt *.mk because "$" would have to be doubled, and besides, any `...` expression in a .mk file is almost certainly evaluated before init.sh is run. Finally, also exempt the perl-based tests, because perl's `...` cannot be converted to $(...). Do that by running this command: git grep -l '`.*`' tests \ | grep -Ev 'init\.sh|\.mk$' | xargs grep -Lw perl \ | xargs perl -pi -e 's/`(.*?)`/\$($1)/g' One minor fix-up change was required after that, due to how quoting differs: diff --git a/tests/chmod/equals b/tests/chmod/equals - expected_perms=$(eval 'echo \$expected_'$dest) + expected_perms=$(eval 'echo $expected_'$dest) Another was to make these required quoting adjustments: diff --git a/tests/misc/stty b/tests/misc/stty ... - rev=$(eval echo "\\\$REV_$opt") + rev=$(eval echo "\$REV_$opt") ... - rev1=$(eval echo "\\\$REV_$opt1") - rev2=$(eval echo "\\\$REV_$opt2") + rev1=$(eval echo "\$REV_$opt1") + rev2=$(eval echo "\$REV_$opt2") Also, transform two files that were needlessly excluded above: (both use perl, but are mostly bourne shell) perl -pi -e 's/`(.*?)`/\$($1)/g' \ tests/du/long-from-unreadable tests/init.cfg
Diffstat (limited to 'tests/readlink')
-rwxr-xr-xtests/readlink/can-e40
-rwxr-xr-xtests/readlink/can-f72
-rwxr-xr-xtests/readlink/can-m64
-rwxr-xr-xtests/readlink/rl-110
4 files changed, 93 insertions, 93 deletions
diff --git a/tests/readlink/can-e b/tests/readlink/can-e
index 5dc73892d..32b75c595 100755
--- a/tests/readlink/can-e
+++ b/tests/readlink/can-e
@@ -19,7 +19,7 @@
. "${srcdir=.}/init.sh"; path_prepend_ ../src
print_ver_ readlink
-pwd=`pwd`
+pwd=$(pwd)
my_pwd=$("$abs_top_builddir/src/pwd")
tmp=d
@@ -38,7 +38,7 @@ cd "$pwd/$tmp/removed" || framework_failure_
# Skip this test if the system doesn't let you remove the working directory.
if rmdir ../removed 2>/dev/null; then
- v=`readlink -e .` && fail=1
+ v=$(readlink -e .) && fail=1
test -z "$v" || fail=1
fi
@@ -46,58 +46,58 @@ cd "$pwd/$tmp" || fail=1
for p in "" "$pwd/$tmp/"; do
- v=`readlink -e "${p}regfile"` || fail=1
+ v=$(readlink -e "${p}regfile") || fail=1
test "$v" = "$my_pwd/$tmp/regfile" || fail=1
- v=`readlink -e "${p}./regfile/"` && fail=1
+ v=$(readlink -e "${p}./regfile/") && fail=1
test -z "$v" || fail=1
- v=`readlink -e "${p}subdir"` || fail=1
+ v=$(readlink -e "${p}subdir") || fail=1
test "$v" = "$my_pwd/$tmp/subdir" || fail=1
- v=`readlink -e "${p}./subdir/"` || fail=1
+ v=$(readlink -e "${p}./subdir/") || fail=1
test "$v" = "$my_pwd/$tmp/subdir" || fail=1
- v=`readlink -e "${p}missing"` && fail=1
+ v=$(readlink -e "${p}missing") && fail=1
test -z "$v" || fail=1
- v=`readlink -e "${p}./missing/"` && fail=1
+ v=$(readlink -e "${p}./missing/") && fail=1
test -z "$v" || fail=1
- v=`readlink -e "${p}link1"` || fail=1
+ v=$(readlink -e "${p}link1") || fail=1
test "$v" = "$my_pwd/$tmp/regfile" || fail=1
- v=`readlink -e "${p}./link1/"` && fail=1
+ v=$(readlink -e "${p}./link1/") && fail=1
test -z "$v" || fail=1
- v=`readlink -e "${p}link1/more"` && fail=1
+ v=$(readlink -e "${p}link1/more") && fail=1
test -z "$v" || fail=1
- v=`readlink -e "${p}link2"` || fail=1
+ v=$(readlink -e "${p}link2") || fail=1
test "$v" = "$my_pwd/$tmp/subdir" || fail=1
- v=`readlink -e "${p}./link2/"` || fail=1
+ v=$(readlink -e "${p}./link2/") || fail=1
test "$v" = "$my_pwd/$tmp/subdir" || fail=1
- v=`readlink -e "${p}link2/more"` && fail=1
+ v=$(readlink -e "${p}link2/more") && fail=1
test -z "$v" || fail=1
- v=`readlink -e "${p}link3"` && fail=1
+ v=$(readlink -e "${p}link3") && fail=1
test -z "$v" || fail=1
- v=`readlink -e "${p}./link3/"` && fail=1
+ v=$(readlink -e "${p}./link3/") && fail=1
test -z "$v" || fail=1
- v=`readlink -e "${p}link3/more"` && fail=1
+ v=$(readlink -e "${p}link3/more") && fail=1
test -z "$v" || fail=1
- v=`readlink -e "${p}link4"` && fail=1
+ v=$(readlink -e "${p}link4") && fail=1
test -z "$v" || fail=1
- v=`readlink -e "${p}./link4/"` && fail=1
+ v=$(readlink -e "${p}./link4/") && fail=1
test -z "$v" || fail=1
- v=`readlink -e "${p}link4/more"` && fail=1
+ v=$(readlink -e "${p}link4/more") && fail=1
test -z "$v" || fail=1
done
diff --git a/tests/readlink/can-f b/tests/readlink/can-f
index aff8c80ed..3f296010c 100755
--- a/tests/readlink/can-f
+++ b/tests/readlink/can-f
@@ -19,7 +19,7 @@
. "${srcdir=.}/init.sh"; path_prepend_ ../src
print_ver_ readlink
-pwd=`pwd`
+pwd=$(pwd)
my_pwd=$("$abs_top_builddir/src/pwd")
tmp=d
@@ -39,7 +39,7 @@ cd "$pwd/$tmp/removed" || framework_failure_
# Skip this test if the system doesn't let you remove the working directory.
if rmdir ../removed 2>/dev/null; then
- v=`readlink -e .` && fail=1
+ v=$(readlink -e .) && fail=1
test -z "$v" || fail=1
fi
@@ -47,106 +47,106 @@ cd "$pwd/$tmp" || fail=1
for p in "" "$pwd/$tmp/"; do
- v=`readlink -f "${p}regfile"` || fail=1
+ v=$(readlink -f "${p}regfile") || fail=1
test "$v" = "$my_pwd/$tmp/regfile" || fail=1
- v=`readlink -f "${p}./regfile/"` && fail=1
+ v=$(readlink -f "${p}./regfile/") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}regfile/more"` && fail=1
+ v=$(readlink -f "${p}regfile/more") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}./regfile/more/"` && fail=1
+ v=$(readlink -f "${p}./regfile/more/") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}subdir"` || fail=1
+ v=$(readlink -f "${p}subdir") || fail=1
test "$v" = "$my_pwd/$tmp/subdir" || fail=1
- v=`readlink -f "${p}./subdir/"` || fail=1
+ v=$(readlink -f "${p}./subdir/") || fail=1
test "$v" = "$my_pwd/$tmp/subdir" || fail=1
- v=`readlink -f "${p}subdir/more"` || fail=1
+ v=$(readlink -f "${p}subdir/more") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1
- v=`readlink -f "${p}./subdir/more/"` || fail=1
+ v=$(readlink -f "${p}./subdir/more/") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1
- v=`readlink -f "${p}missing"` || fail=1
+ v=$(readlink -f "${p}missing") || fail=1
test "$v" = "$my_pwd/$tmp/missing" || fail=1
- v=`readlink -f "${p}./missing/"` || fail=1
+ v=$(readlink -f "${p}./missing/") || fail=1
test "$v" = "$my_pwd/$tmp/missing" || fail=1
- v=`readlink -f "${p}missing/more"` && fail=1
+ v=$(readlink -f "${p}missing/more") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}./missing/more/"` && fail=1
+ v=$(readlink -f "${p}./missing/more/") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}link1"` || fail=1
+ v=$(readlink -f "${p}link1") || fail=1
test "$v" = "$my_pwd/$tmp/regfile" || fail=1
- v=`readlink -f "${p}./link1/"` && fail=1
+ v=$(readlink -f "${p}./link1/") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}link1/more"` && fail=1
+ v=$(readlink -f "${p}link1/more") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}./link1/more/"` && fail=1
+ v=$(readlink -f "${p}./link1/more/") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}link2"` || fail=1
+ v=$(readlink -f "${p}link2") || fail=1
test "$v" = "$my_pwd/$tmp/subdir" || fail=1
- v=`readlink -f "${p}./link2/"` || fail=1
+ v=$(readlink -f "${p}./link2/") || fail=1
test "$v" = "$my_pwd/$tmp/subdir" || fail=1
- v=`readlink -f "${p}link2/more"` || fail=1
+ v=$(readlink -f "${p}link2/more") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1
- v=`readlink -f "${p}./link2/more/"` || fail=1
+ v=$(readlink -f "${p}./link2/more/") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1
- v=`readlink -f "${p}link2/more/more2"` && fail=1
+ v=$(readlink -f "${p}link2/more/more2") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}./link2/more/more2/"` && fail=1
+ v=$(readlink -f "${p}./link2/more/more2/") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}link3"` || fail=1
+ v=$(readlink -f "${p}link3") || fail=1
test "$v" = "$my_pwd/$tmp/missing" || fail=1
- v=`readlink -f "${p}./link3/"` || fail=1
+ v=$(readlink -f "${p}./link3/") || fail=1
test "$v" = "$my_pwd/$tmp/missing" || fail=1
- v=`readlink -f "${p}link3/more"` && fail=1
+ v=$(readlink -f "${p}link3/more") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}./link3/more/"` && fail=1
+ v=$(readlink -f "${p}./link3/more/") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}link4"` || fail=1
+ v=$(readlink -f "${p}link4") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1
- v=`readlink -f "${p}./link4/"` || fail=1
+ v=$(readlink -f "${p}./link4/") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1
- v=`readlink -f "${p}link4/more"` && fail=1
+ v=$(readlink -f "${p}link4/more") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}./link4/more"` && fail=1
+ v=$(readlink -f "${p}./link4/more") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}link5"` && fail=1
+ v=$(readlink -f "${p}link5") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}./link5/"` && fail=1
+ v=$(readlink -f "${p}./link5/") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}link5/more"` && fail=1
+ v=$(readlink -f "${p}link5/more") && fail=1
test -z "$v" || fail=1
- v=`readlink -f "${p}./link5/more"` && fail=1
+ v=$(readlink -f "${p}./link5/more") && fail=1
test -z "$v" || fail=1
done
diff --git a/tests/readlink/can-m b/tests/readlink/can-m
index d3e0b7c30..09a96f509 100755
--- a/tests/readlink/can-m
+++ b/tests/readlink/can-m
@@ -19,7 +19,7 @@
. "${srcdir=.}/init.sh"; path_prepend_ ../src
print_ver_ readlink
-pwd=`pwd`
+pwd=$(pwd)
my_pwd=$("$abs_top_builddir/src/pwd")
tmp=d
@@ -38,7 +38,7 @@ cd "$pwd/$tmp/removed" || framework_failure_
# Skip this test if the system doesn't let you remove the working directory.
if rmdir ../removed 2>/dev/null; then
- v=`readlink -e .` && fail=1
+ v=$(readlink -e .) && fail=1
test -z "$v" || fail=1
fi
@@ -46,94 +46,94 @@ cd "$pwd/$tmp" || fail=1
for p in "" "$pwd/$tmp/"; do
- v=`readlink -m "${p}regfile"` || fail=1
+ v=$(readlink -m "${p}regfile") || fail=1
test "$v" = "$my_pwd/$tmp/regfile" || fail=1
- v=`readlink -m "${p}./regfile/"` || fail=1
+ v=$(readlink -m "${p}./regfile/") || fail=1
test "$v" = "$my_pwd/$tmp/regfile" || fail=1
- v=`readlink -m "${p}regfile/more"` || fail=1
+ v=$(readlink -m "${p}regfile/more") || fail=1
test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1
- v=`readlink -m "${p}./regfile/more/"` || fail=1
+ v=$(readlink -m "${p}./regfile/more/") || fail=1
test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1
- v=`readlink -m "${p}subdir"` || fail=1
+ v=$(readlink -m "${p}subdir") || fail=1
test "$v" = "$my_pwd/$tmp/subdir" || fail=1
- v=`readlink -m "${p}./subdir/"` || fail=1
+ v=$(readlink -m "${p}./subdir/") || fail=1
test "$v" = "$my_pwd/$tmp/subdir" || fail=1
- v=`readlink -m "${p}subdir/more"` || fail=1
+ v=$(readlink -m "${p}subdir/more") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1
- v=`readlink -m "${p}./subdir/more/"` || fail=1
+ v=$(readlink -m "${p}./subdir/more/") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1
- v=`readlink -m "${p}missing"` || fail=1
+ v=$(readlink -m "${p}missing") || fail=1
test "$v" = "$my_pwd/$tmp/missing" || fail=1
- v=`readlink -m "${p}./missing/"` || fail=1
+ v=$(readlink -m "${p}./missing/") || fail=1
test "$v" = "$my_pwd/$tmp/missing" || fail=1
- v=`readlink -m "${p}missing/more"` || fail=1
+ v=$(readlink -m "${p}missing/more") || fail=1
test "$v" = "$my_pwd/$tmp/missing/more" || fail=1
- v=`readlink -m "${p}./missing/more/"` || fail=1
+ v=$(readlink -m "${p}./missing/more/") || fail=1
test "$v" = "$my_pwd/$tmp/missing/more" || fail=1
- v=`readlink -m "${p}link1"` || fail=1
+ v=$(readlink -m "${p}link1") || fail=1
test "$v" = "$my_pwd/$tmp/regfile" || fail=1
- v=`readlink -m "${p}./link1/"` || fail=1
+ v=$(readlink -m "${p}./link1/") || fail=1
test "$v" = "$my_pwd/$tmp/regfile" || fail=1
- v=`readlink -m "${p}link1/more"` || fail=1
+ v=$(readlink -m "${p}link1/more") || fail=1
test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1
- v=`readlink -m "${p}./link1/more/"` || fail=1
+ v=$(readlink -m "${p}./link1/more/") || fail=1
test "$v" = "$my_pwd/$tmp/regfile/more" || fail=1
- v=`readlink -m "${p}link2"` || fail=1
+ v=$(readlink -m "${p}link2") || fail=1
test "$v" = "$my_pwd/$tmp/subdir" || fail=1
- v=`readlink -m "${p}./link2/"` || fail=1
+ v=$(readlink -m "${p}./link2/") || fail=1
test "$v" = "$my_pwd/$tmp/subdir" || fail=1
- v=`readlink -m "${p}link2/more"` || fail=1
+ v=$(readlink -m "${p}link2/more") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1
- v=`readlink -m "${p}./link2/more/"` || fail=1
+ v=$(readlink -m "${p}./link2/more/") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1
- v=`readlink -m "${p}link2/more/more2"` || fail=1
+ v=$(readlink -m "${p}link2/more/more2") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/more/more2" || fail=1
- v=`readlink -m "${p}./link2/more/more2/"` || fail=1
+ v=$(readlink -m "${p}./link2/more/more2/") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/more/more2" || fail=1
- v=`readlink -m "${p}link3"` || fail=1
+ v=$(readlink -m "${p}link3") || fail=1
test "$v" = "$my_pwd/$tmp/missing" || fail=1
- v=`readlink -m "${p}./link3/"` || fail=1
+ v=$(readlink -m "${p}./link3/") || fail=1
test "$v" = "$my_pwd/$tmp/missing" || fail=1
- v=`readlink -m "${p}link3/more"` || fail=1
+ v=$(readlink -m "${p}link3/more") || fail=1
test "$v" = "$my_pwd/$tmp/missing/more" || fail=1
- v=`readlink -m "${p}./link3/more/"` || fail=1
+ v=$(readlink -m "${p}./link3/more/") || fail=1
test "$v" = "$my_pwd/$tmp/missing/more" || fail=1
- v=`readlink -m "${p}link4"` || fail=1
+ v=$(readlink -m "${p}link4") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1
- v=`readlink -m "${p}./link4/"` || fail=1
+ v=$(readlink -m "${p}./link4/") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1
- v=`readlink -m "${p}link4/more"` || fail=1
+ v=$(readlink -m "${p}link4/more") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/missing/more" || fail=1
- v=`readlink -m "${p}./link4/more/"` || fail=1
+ v=$(readlink -m "${p}./link4/more/") || fail=1
test "$v" = "$my_pwd/$tmp/subdir/missing/more" || fail=1
done
diff --git a/tests/readlink/rl-1 b/tests/readlink/rl-1
index 7f2ddc2e0..511a9890e 100755
--- a/tests/readlink/rl-1
+++ b/tests/readlink/rl-1
@@ -25,19 +25,19 @@ ln -s regfile link1 || framework_failure_
ln -s missing link2 || framework_failure_
-v=`readlink link1` || fail=1
+v=$(readlink link1) || fail=1
test "$v" = regfile || fail=1
-v=`readlink link2` || fail=1
+v=$(readlink link2) || fail=1
test "$v" = missing || fail=1
-v=`readlink subdir` && fail=1
+v=$(readlink subdir) && fail=1
test -z "$v" || fail=1
-v=`readlink regfile` && fail=1
+v=$(readlink regfile) && fail=1
test -z "$v" || fail=1
-v=`readlink missing` && fail=1
+v=$(readlink missing) && fail=1
test -z "$v" || fail=1
Exit $fail