diff options
author | Ron Yorston <rmy@pobox.com> | 2019-08-16 14:15:36 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2019-08-16 14:15:36 +0100 |
commit | 48128b9aac24f7bf9e7fe776f09c29d662f871f8 (patch) | |
tree | d174f1a46e8509c4e00b447a9397fedc0933cf63 | |
parent | 6a7524634e79519007ac61d8f0bc6f254118b7f4 (diff) | |
download | busybox-w32-FRP-3244-g48128b9aa.tar.gz busybox-w32-FRP-3244-g48128b9aa.tar.bz2 busybox-w32-FRP-3244-g48128b9aa.zip |
testsuite: ensure tests work when directory name has spacesFRP-3244-g48128b9aa
-rwxr-xr-x | testsuite/busybox.tests | 6 | ||||
-rwxr-xr-x | testsuite/runtest | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests index a671fa082..2ce09b281 100755 --- a/testsuite/busybox.tests +++ b/testsuite/busybox.tests | |||
@@ -7,7 +7,7 @@ | |||
7 | . ./testing.sh | 7 | . ./testing.sh |
8 | test -f "$bindir/.config" && . "$bindir/.config" | 8 | test -f "$bindir/.config" && . "$bindir/.config" |
9 | 9 | ||
10 | if [ -f $bindir/busybox.exe ]; then | 10 | if [ -f "$bindir/busybox.exe" ]; then |
11 | # Copy rather than link busybox.exe: we can only make hard | 11 | # Copy rather than link busybox.exe: we can only make hard |
12 | # links which can't be deleted because Windows sees the | 12 | # links which can't be deleted because Windows sees the |
13 | # executable as running. | 13 | # executable as running. |
@@ -18,7 +18,7 @@ else | |||
18 | lncmd="ln -s" | 18 | lncmd="ln -s" |
19 | fi | 19 | fi |
20 | 20 | ||
21 | $lncmd `which busybox` unknown$suffix | 21 | $lncmd "$(which busybox)" unknown$suffix |
22 | 22 | ||
23 | testing "busybox as unknown name" "./unknown 2>&1" \ | 23 | testing "busybox as unknown name" "./unknown 2>&1" \ |
24 | "unknown: applet not found\n" "" "" | 24 | "unknown: applet not found\n" "" "" |
@@ -34,7 +34,7 @@ optional FEATURE_VERBOSE_USAGE | |||
34 | testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n" "" "" | 34 | testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n" "" "" |
35 | SKIP= | 35 | SKIP= |
36 | 36 | ||
37 | $lncmd `which busybox` busybox-suffix$suffix | 37 | $lncmd "$(which busybox)" busybox-suffix$suffix |
38 | for i in busybox ./busybox-suffix | 38 | for i in busybox ./busybox-suffix |
39 | do | 39 | do |
40 | testing "$i" "$i 2>&1 | cat" "$HELPDUMP\n" "" "" | 40 | testing "$i" "$i 2>&1 | cat" "$HELPDUMP\n" "" "" |
diff --git a/testsuite/runtest b/testsuite/runtest index 9f9e8d3bd..adbcb1178 100755 --- a/testsuite/runtest +++ b/testsuite/runtest | |||
@@ -99,7 +99,7 @@ if [ x"$1" = x"-v" ]; then | |||
99 | shift | 99 | shift |
100 | fi | 100 | fi |
101 | 101 | ||
102 | if [ -f $bindir/busybox.exe ]; then | 102 | if [ -f "$bindir/busybox.exe" ]; then |
103 | suffix=".exe" | 103 | suffix=".exe" |
104 | lnflag="" | 104 | lnflag="" |
105 | 105 | ||