Skip to content

Commit 1aab1ad

Browse files
dschodscho
committed
tests: use the correct path separator with BusyBox
BusyBox-w32 is a true Win32 application, i.e. it does not come with a POSIX emulation layer. That also means that it does *not* use the Unix convention of separating the entries in the PATH variable using colons, but semicolons. However, there are also BusyBox ports to Windows which use a POSIX emulation layer such as Cygwin's or MSYS2's runtime, i.e. using colons as PATH separators. As a tell-tale, let's use the presence of semicolons in the PATH variable: on Unix, it is highly unlikely that it contains semicolons, and on Windows (without POSIX emulation), it is virtually guaranteed, as everybody should have both $SYSTEMROOT and $SYSTEMROOT/system32 in their PATH. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 95f6db9 commit 1aab1ad

17 files changed

+54
-41
lines changed

‎t/interop/interop-lib.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
. ../../GIT-BUILD-OPTIONS
55
INTEROP_ROOT=$(pwd)
66
BUILD_ROOT=$INTEROP_ROOT/build
7+
case "$PATH" in
8+
*\;*) PATH_SEP=\; ;;
9+
*) PATH_SEP=: ;;
10+
esac
711

812
build_version () {
913
if test -z "$1"
@@ -57,7 +61,7 @@ wrap_git () {
5761
write_script "$1" <<-EOF
5862
GIT_EXEC_PATH="$2"
5963
export GIT_EXEC_PATH
60-
PATH="$2:\$PATH"
64+
PATH="$2$PATH_SEP\$PATH"
6165
export GIT_EXEC_PATH
6266
exec git "\$@"
6367
EOF
@@ -71,7 +75,7 @@ generate_wrappers () {
7175
echo >&2 fatal: test tried to run generic git: $*
7276
exit 1
7377
EOF
74-
PATH=$(pwd)/.bin:$PATH
78+
PATH=$(pwd)/.bin$PATH_SEP$PATH
7579
}
7680

7781
VERSION_A=${GIT_TEST_VERSION_A:-$VERSION_A}

‎t/lib-proto-disable.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ setup_ext_wrapper () {
214214
cd "$TRASH_DIRECTORY/remote" &&
215215
eval "$*"
216216
EOF
217-
PATH=$TRASH_DIRECTORY:$PATH &&
217+
PATH=$TRASH_DIRECTORY$PATH_SEP$PATH &&
218218
export TRASH_DIRECTORY
219219
'
220220
}

‎t/t0021-conversion.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ TEST_PASSES_SANITIZE_LEAK=true
99
. ./test-lib.sh
1010
. "$TEST_DIRECTORY"/lib-terminal.sh
1111

12-
PATH=$PWD:$PATH
12+
PATH=$PWD$PATH_SEP$PATH
1313
TEST_ROOT="$(pwd)"
1414

1515
write_script <<\EOF "$TEST_ROOT/rot13.sh"

‎t/t0060-path-utils.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -148,25 +148,25 @@ ancestor /foo /fo -1
148148
ancestor /foo /foo -1
149149
ancestor /foo /bar -1
150150
ancestor /foo /foo/bar -1
151-
ancestor /foo /foo:/bar -1
152-
ancestor /foo /:/foo:/bar 0
153-
ancestor /foo /foo:/:/bar 0
154-
ancestor /foo /:/bar:/foo 0
151+
ancestor /foo "/foo$PATH_SEP/bar" -1
152+
ancestor /foo "/$PATH_SEP/foo$PATH_SEP/bar" 0
153+
ancestor /foo "/foo$PATH_SEP/$PATH_SEP/bar" 0
154+
ancestor /foo "/$PATH_SEP/bar$PATH_SEP/foo" 0
155155
ancestor /foo/bar / 0
156156
ancestor /foo/bar /fo -1
157157
ancestor /foo/bar /foo 4
158158
ancestor /foo/bar /foo/ba -1
159-
ancestor /foo/bar /:/fo 0
160-
ancestor /foo/bar /foo:/foo/ba 4
159+
ancestor /foo/bar "/$PATH_SEP/fo" 0
160+
ancestor /foo/bar "/foo$PATH_SEP/foo/ba" 4
161161
ancestor /foo/bar /bar -1
162162
ancestor /foo/bar /fo -1
163-
ancestor /foo/bar /foo:/bar 4
164-
ancestor /foo/bar /:/foo:/bar 4
165-
ancestor /foo/bar /foo:/:/bar 4
166-
ancestor /foo/bar /:/bar:/fo 0
167-
ancestor /foo/bar /:/bar 0
163+
ancestor /foo/bar "/foo$PATH_SEP/bar" 4
164+
ancestor /foo/bar "/$PATH_SEP/foo$PATH_SEP/bar" 4
165+
ancestor /foo/bar "/foo$PATH_SEP/$PATH_SEP/bar" 4
166+
ancestor /foo/bar "/$PATH_SEP/bar$PATH_SEP/fo" 0
167+
ancestor /foo/bar "/$PATH_SEP/bar" 0
168168
ancestor /foo/bar /foo 4
169-
ancestor /foo/bar /foo:/bar 4
169+
ancestor /foo/bar "/foo$PATH_SEP/bar" 4
170170
ancestor /foo/bar /bar -1
171171

172172
# Windows-specific: DOS drives, network shares

‎t/t0061-run-command.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ test_expect_success 'run_command does not try to execute a directory' '
7070
cat bin2/greet
7171
EOF
7272
73-
PATH=$PWD/bin1:$PWD/bin2:$PATH \
73+
PATH=$PWD/bin1$PATH_SEP$PWD/bin2$PATH_SEP$PATH \
7474
test-tool run-command run-command greet >actual 2>err &&
7575
test_cmp bin2/greet actual &&
7676
test_must_be_empty err
@@ -87,7 +87,7 @@ test_expect_success POSIXPERM 'run_command passes over non-executable file' '
8787
cat bin2/greet
8888
EOF
8989
90-
PATH=$PWD/bin1:$PWD/bin2:$PATH \
90+
PATH=$PWD/bin1$PATH_SEP$PWD/bin2$PATH_SEP$PATH \
9191
test-tool run-command run-command greet >actual 2>err &&
9292
test_cmp bin2/greet actual &&
9393
test_must_be_empty err
@@ -107,7 +107,7 @@ test_expect_success POSIXPERM,SANITY 'unreadable directory in PATH' '
107107
git config alias.nitfol "!echo frotz" &&
108108
chmod a-rx local-command &&
109109
(
110-
PATH=./local-command:$PATH &&
110+
PATH=./local-command$PATH_SEP$PATH &&
111111
git nitfol >actual
112112
) &&
113113
echo frotz >expect &&

‎t/t0300-credentials.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ test_expect_success 'setup helper scripts' '
7777
test -z "$pexpiry" || echo password_expiry_utc=$pexpiry
7878
EOF
7979
80-
PATH="$PWD:$PATH"
80+
PATH="$PWD$PATH_SEP$PATH"
8181
'
8282

8383
test_expect_success 'credential_fill invokes helper' '

‎t/t1504-ceiling-dirs.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ then
8585
GIT_CEILING_DIRECTORIES="$TRASH_ROOT/top/"
8686
test_fail subdir_ceil_at_top_slash
8787

88-
GIT_CEILING_DIRECTORIES=":$TRASH_ROOT/top"
88+
GIT_CEILING_DIRECTORIES="$PATH_SEP$TRASH_ROOT/top"
8989
test_prefix subdir_ceil_at_top_no_resolve "sub/dir/"
90-
GIT_CEILING_DIRECTORIES=":$TRASH_ROOT/top/"
90+
GIT_CEILING_DIRECTORIES="$PATH_SEP$TRASH_ROOT/top/"
9191
test_prefix subdir_ceil_at_top_slash_no_resolve "sub/dir/"
9292
fi
9393

@@ -117,13 +117,13 @@ GIT_CEILING_DIRECTORIES="$TRASH_ROOT/subdi"
117117
test_prefix subdir_ceil_at_subdi_slash "sub/dir/"
118118

119119

120-
GIT_CEILING_DIRECTORIES="/foo:$TRASH_ROOT/sub"
120+
GIT_CEILING_DIRECTORIES="/foo$PATH_SEP$TRASH_ROOT/sub"
121121
test_fail second_of_two
122122

123-
GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub:/bar"
123+
GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub$PATH_SEP/bar"
124124
test_fail first_of_two
125125

126-
GIT_CEILING_DIRECTORIES="/foo:$TRASH_ROOT/sub:/bar"
126+
GIT_CEILING_DIRECTORIES="/foo$PATH_SEP$TRASH_ROOT/sub$PATH_SEP/bar"
127127
test_fail second_of_three
128128

129129

‎t/t2300-cd-to-toplevel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ test_cd_to_toplevel () {
1717
test_expect_success $3 "$2" '
1818
(
1919
cd '"'$1'"' &&
20-
PATH="$EXEC_PATH:$PATH" &&
20+
PATH="$EXEC_PATH$PATH_SEP$PATH" &&
2121
. git-sh-setup &&
2222
cd_to_toplevel &&
2323
[ "$(pwd -P)" = "$TOPLEVEL" ]

‎t/t3418-rebase-continue.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ test_expect_success 'rebase --continue remembers merge strategy and options' '
8383
8484
rm -f actual &&
8585
(
86-
PATH=./test-bin:$PATH &&
86+
PATH=./test-bin$PATH_SEP$PATH &&
8787
test_must_fail git rebase -s funny -X"option=arg with space" \
8888
-Xop\"tion\\ -X"new${LF}line " main topic
8989
) &&
@@ -92,7 +92,7 @@ test_expect_success 'rebase --continue remembers merge strategy and options' '
9292
echo "Resolved" >F2 &&
9393
git add F2 &&
9494
(
95-
PATH=./test-bin:$PATH &&
95+
PATH=./test-bin$PATH_SEP$PATH &&
9696
git rebase --continue
9797
) &&
9898
test_cmp expect actual

‎t/t5615-alternate-env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ test_expect_success 'access alternate via absolute path' '
4040
'
4141

4242
test_expect_success 'access multiple alternates' '
43-
check_obj "$PWD/one.git/objects:$PWD/two.git/objects" <<-EOF
43+
check_obj "$PWD/one.git/objects$PATH_SEP$PWD/two.git/objects" <<-EOF
4444
$one blob
4545
$two blob
4646
EOF
@@ -76,7 +76,7 @@ test_expect_success 'access alternate via relative path (subdir)' '
7676
quoted='"one.git\057objects"'
7777
unquoted='two.git/objects'
7878
test_expect_success 'mix of quoted and unquoted alternates' '
79-
check_obj "$quoted:$unquoted" <<-EOF
79+
check_obj "$quoted$PATH_SEP$unquoted" <<-EOF
8080
$one blob
8181
$two blob
8282
EOF

0 commit comments

Comments
 (0)