Skip to content

Commit 88f4160

Browse files
committed
ts: get correct tags for mod having same name than a loaded mod
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent ded0b4e commit 88f4160

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,9 +529,8 @@ setenv_var MODULES_AVAIL_OUTPUT sym:tag:modulepath:via
529529
setenv_loaded_module [list foo/0.2] [list $modpath.2/foo/0.2]
530530
setenv_var __MODULES_LMUSE foo/0.2&$modpath.3
531531
setenv_path_var MODULEPATH $modpath.3:$modpath.2
532-
# FIXME: only foo/0.2 from modpath.2 should appear with L tag
533532
testouterr_cmd_re sh {avail foo/0} OK "$modlin $modpathre.3 \\(via foo/0.2\\) $modlin
534-
foo/0.2\\(sym\\) <L:tag> foo/0.err foo/0.load foo/0.prereq
533+
foo/0.2\\(sym\\) <tag> foo/0.err foo/0.load foo/0.prereq
535534

536535
$modlin $modpathre.2 $modlin
537536
foo/0.1 foo/0.2\\(sym\\) <L:tag> "

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,9 +497,8 @@ setenv_var MODULES_SPIDER_OUTPUT sym:tag:modulepath:via
497497
setenv_loaded_module [list foo/0.2] [list $modpath.2/foo/0.2]
498498
setenv_var __MODULES_LMUSE foo/0.2&$modpath.3
499499
setenv_path_var MODULEPATH $modpath.3:$modpath.2
500-
# FIXME: only foo/0.2 from modpath.2 should appear with L tag
501500
testouterr_cmd_re sh {spider foo/0} OK "$modlin $modpathre.3 \\(via foo/0.2\\) $modlin
502-
foo/0.2\\(sym\\) <L:tag> foo/0.err foo/0.load foo/0.prereq
501+
foo/0.2\\(sym\\) <tag> foo/0.err foo/0.load foo/0.prereq
503502

504503
$modlin $modpathre.2 $modlin
505504
foo/0.1 foo/0.2\\(sym\\) <L:tag> "

0 commit comments

Comments
 (0)