Skip to content

Commit d5ce06e

Browse files
committed
ts: fix incorrect test env in 70/36{0,2}
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent 2c416a8 commit d5ce06e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

testsuite/modules.70-maint/360-avail_output.exp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ modb/1 modb/2 "
467467
# several loaded modules using same modulepath
468468
unsetenv_var TESTSUITE_VIA
469469
setenv_path_var MODULEPATH $modpath.spider2:$modpath.spider1
470-
setenv_loaded_module [list moda/1 moda/2] [list $modpath.spider1/moda/1 $modpath.spider2/moda/2]
470+
setenv_loaded_module [list moda/1 moda/2] [list $modpath.spider1/moda/1 $modpath.spider1/moda/2]
471471
setenv_var __MODULES_LMUSE moda/1&$modpath.spider2:moda/2&$modpath.spider2
472472
set tserr "$modlin $modpathre.spider2 \\(via moda/1\\) $modlin
473473
modb/1 modb/2
@@ -485,6 +485,7 @@ modb/1 modb/2
485485

486486
$modlin $modpathre.spider1 $modlin
487487
moda/1 <L> moda/2 <L> "
488+
testouterr_cmd_re sh {avail mod} OK $tserr
488489
unsetenv_var __MODULES_SHARE_MODULEPATH
489490

490491
# whatis/search report (no effect)

testsuite/modules.70-maint/362-spider_output.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ modc/1 modc/2 "
429429
# several loaded modules using same modulepath
430430
unsetenv_var TESTSUITE_VIA
431431
setenv_path_var MODULEPATH $modpath.spider2:$modpath.spider1
432-
setenv_loaded_module [list moda/1 moda/2] [list $modpath.spider1/moda/1 $modpath.spider2/moda/2]
432+
setenv_loaded_module [list moda/1 moda/2] [list $modpath.spider1/moda/1 $modpath.spider1/moda/2]
433433
setenv_var __MODULES_LMUSE moda/1&$modpath.spider2:moda/2&$modpath.spider2
434434
set tserr "$modlin $modpathre.spider2 \\(via moda/1\\) $modlin
435435
modb/1 modb/2

0 commit comments

Comments
 (0)