summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2019-08-16 14:15:36 +0100
committerRon Yorston <rmy@pobox.com>2019-08-16 14:15:36 +0100
commit48128b9aac24f7bf9e7fe776f09c29d662f871f8 (patch)
treed174f1a46e8509c4e00b447a9397fedc0933cf63
parent6a7524634e79519007ac61d8f0bc6f254118b7f4 (diff)
downloadbusybox-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-xtestsuite/busybox.tests6
-rwxr-xr-xtestsuite/runtest2
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
8test -f "$bindir/.config" && . "$bindir/.config" 8test -f "$bindir/.config" && . "$bindir/.config"
9 9
10if [ -f $bindir/busybox.exe ]; then 10if [ -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"
19fi 19fi
20 20
21$lncmd `which busybox` unknown$suffix 21$lncmd "$(which busybox)" unknown$suffix
22 22
23testing "busybox as unknown name" "./unknown 2>&1" \ 23testing "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
34testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n" "" "" 34testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n" "" ""
35SKIP= 35SKIP=
36 36
37$lncmd `which busybox` busybox-suffix$suffix 37$lncmd "$(which busybox)" busybox-suffix$suffix
38for i in busybox ./busybox-suffix 38for i in busybox ./busybox-suffix
39do 39do
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
100fi 100fi
101 101
102if [ -f $bindir/busybox.exe ]; then 102if [ -f "$bindir/busybox.exe" ]; then
103 suffix=".exe" 103 suffix=".exe"
104 lnflag="" 104 lnflag=""
105 105