Skip to content

Commit 67eedd9

Browse files
committed
ts: fix space tests for MSYS environment
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent 530ad53 commit 67eedd9

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

testsuite/modules.20-locate/100-wspace.exp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,8 @@ unsetenv_var __MODULES_LMALTNAME
639639
set mp "$modpath wspac "
640640
set mpre "$modpathre wspac "
641641
# create modulepath finishing by space on the file (it crashes git checkout on Windows if saved in repo)
642-
if {!$is_symlink_supported || [catch {file link -symbolic $mp modulefiles.2}]} {
642+
# MSYS environment does not support anymore such test
643+
if {!$is_symlink_supported || [string match MSYS_NT* $tcl_platform(os)] || [catch {file link -symbolic $mp modulefiles.2}]} {
643644
send_user "\tskipping tests over '$mp' modulepath as symbolic links are not supported on filesystem\n"
644645
} else {
645646

testsuite/modules.90-avail/080-noindepth.exp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,8 @@ testouterr_cmd sh {avail -t space\ ya} OK "$mp:\n'space ya'/"
263263

264264
set mp "$modpath wspac "
265265
# create modulepath finishing by space on the file (it crashes git checkout on Windows if saved in repo)
266-
if {!$is_symlink_supported || [catch {file link -symbolic $mp modulefiles.2}]} {
266+
# MSYS environment does not support anymore such test
267+
if {!$is_symlink_supported || [string match MSYS_NT* $tcl_platform(os)] || [catch {file link -symbolic $mp modulefiles.2}]} {
267268
send_user "\tskipping tests over '$mp' modulepath as symbolic links are not supported on filesystem or cannot be created\n"
268269
} else {
269270

0 commit comments

Comments
 (0)