envmodules/modules
1
0
Fork 0
mirror of https://github.com/envmodules/modules.git synced 2026-05-30 00:12:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ts: adapt tests for #294 and #295 fixes

Browse Source
This commit is contained in:
Xavier Delaruelle
2019-09-19 08:03:30 +02:00
parent f0690d59b9
commit 82ec191dc2
11 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
testsuite/modulefiles.deep/modulerc/.modulerc
View File

@@ -1,4 +1,5 @@
#%Module1.0
##
module-version "./dir1" "default"
module-version "./dir2" foo

1
testsuite/modulefiles/loc_rc3/.modulerc
View File

@@ -27,3 +27,4 @@
module-version /1.0 default
module-version /2.0 cur stable
module-version /3.0 test exp chk new
module-version /0.0 foo

0
testsuite/modulefiles/loc_rc3/0.0/.notmodfile Normal file
View File

11
testsuite/modules.20-locate/031-defvers2.exp
View File

@@ -42,7 +42,7 @@ set modalt_2 "loc_dv7/default&loc_dv7"
set modulefile_2 "$modpath/$module_2"
set modulefilere_2 "$modpathre/$module_2"
# symbol set on directory, so directory appear on avail
set modavail_2 "loc_dv7/2.0/\\s+default\\s+"
set modavail_2 "loc_dv7/2.0/\\s+default\\s+\nloc_dv7/2.0/1.0\\s+$datetime_re"
set nodefault_2 "$err_nodefault'loc_dv7/2.0'"
# default symbol set by using '.version' file using module-version cmd
@@ -120,24 +120,19 @@ for {set i 1} {$i <= 4} {incr i} {
testouterr_cmd_re "sh" "display $modsym" "OK" $displayerr
testouterr_cmd_re "sh" "help $modsym" "OK" $helperr
testouterr_cmd_re "sh" "test $modsym" "OK" $testerr
testouterr_cmd_re "sh" "whatis $modsym" "OK" $whatiserr
} else {
testouterr_cmd "sh" "load $modsym" [if_implicitdefault $ans ERR] [if_implicitdefault {} $nodefault]
testouterr_cmd_re "sh" "display $modsym" [if_implicitdefault OK ERR] [if_implicitdefault $displayerr $nodefault]
testouterr_cmd_re "sh" "help $modsym" [if_implicitdefault OK ERR] [if_implicitdefault $helperr $nodefault]
testouterr_cmd_re "sh" "test $modsym" [if_implicitdefault OK ERR] [if_implicitdefault $testerr $nodefault]
testouterr_cmd_re "sh" "whatis $modsym" [if_implicitdefault OK ERR] [if_implicitdefault $whatiserr $nodefault]
}
testouterr_cmd_re "sh" "avail -l $modsym" "OK" "$avail_pre\n$modavail"
testouterr_cmd_re "sh" "whatis $modsym" "OK" $whatiserr
set ans [list]
lappend ans [list text $modulefile]
if {$nodefault eq {}} {
testouterr_cmd "sh" "paths $modsym" $ans ""
} else {
testouterr_cmd "sh" "paths $modsym" [if_implicitdefault $ans [list [list text {}]]] {}
}
testouterr_cmd "sh" "paths $modsym" $ans ""
}
# test on erroneous modules

2
testsuite/modules.70-maint/130-aliases.exp
View File

@@ -85,6 +85,7 @@ loc_rc3/chk -> loc_rc3/3.0
loc_rc3/cur -> loc_rc3/2.0
loc_rc3/default -> loc_rc3/1.0
loc_rc3/exp -> loc_rc3/3.0
loc_rc3/foo -> loc_rc3/0.0
loc_rc3/new -> loc_rc3/3.0
loc_rc3/stable -> loc_rc3/2.0
loc_rc3/test -> loc_rc3/3.0
@@ -213,6 +214,7 @@ loc_rc3/chk -> loc_rc3/3.0
loc_rc3/cur -> loc_rc3/2.0
loc_rc3/default -> loc_rc3/1.0
loc_rc3/exp -> loc_rc3/3.0
loc_rc3/foo -> loc_rc3/0.0
loc_rc3/new -> loc_rc3/3.0
loc_rc3/stable -> loc_rc3/2.0
loc_rc3/test -> loc_rc3/3.0

2
testsuite/modules.80-deep/010-init_ts.exp
View File

@@ -33,7 +33,7 @@ set omodulerc0 "modulerc/dir1/1.0"
set omodulerc0alt "$omodulerc0&$cmodulerc/dir1/default&$cmodulerc/dir1&$cmodulerc/default&$cmodulerc"
set imodulerc1 "modulerc/dir2"
set omodulerc1 "modulerc/dir2/1.0/rc1"
set omodulerc1alt "$omodulerc1&modulerc/dir2/1.0/default&modulerc/dir2/1.0&modulerc/dir2/default&modulerc/dir2"
set omodulerc1alt "$omodulerc1&modulerc/dir2/1.0/default&modulerc/dir2/1.0&modulerc/dir2/default&modulerc/dir2&modulerc/foo"
set imodulerc2 "modulerc/dir2/2.0"
set omodulerc2 "modulerc/dir2/2.0"

1
testsuite/modules.80-deep/030-display.exp
View File

@@ -32,6 +32,7 @@ testouterr_cmd_re "csh" "display $iplain1" [if_implicitdefault OK ERR] [if_impli
testouterr_cmd_re "csh" "display $imodulerc0" "OK" "$modlin\n$p$omodulerc0$mw$omodulerc0$cf$cmodulerc$sv$omodulerc0$nl"
testouterr_cmd_re "csh" "display $imodulerc1" "OK" "$modlin\n$p$omodulerc1$mw$omodulerc1$cf$cmodulerc$sv$omodulerc1$nl"
testouterr_cmd_re "csh" "display $imodulerc2" "OK" "$modlin\n$p$omodulerc2$mw$omodulerc2$cf$cmodulerc$sv$omodulerc2$nl"
testouterr_cmd_re "csh" "display modulerc/foo" OK "$modlin\n$p$omodulerc1$mw$omodulerc1$cf$cmodulerc$sv$omodulerc1$nl"
testouterr_cmd_re "csh" "display $iversion0" "OK" "$modlin\n$p$oversion0$mw$oversion0$cf$cversion$sv$oversion0$nl"
testouterr_cmd_re "csh" "display $iversion1" "OK" "$modlin\n$p$oversion1$mw$oversion1$cf$cversion$sv$oversion1$nl"

2
testsuite/modules.80-deep/050-whatis.exp
View File

@@ -35,4 +35,6 @@ testouterr_cmd_re "csh" "whatis $idalias1" "OK" "$header\n $odalias1: $odalia
testouterr_cmd_re "csh" "whatis $ibadvers0" "OK" "$header\n $obadvers1: $obadvers1\n $obadvers0: $obadvers0"
testouterr_cmd_re "csh" "whatis $ibadvers1" "OK" "$header\n $obadvers1: $obadvers1"
testouterr_cmd_re "csh" "whatis modulerc/foo" "OK" "$header\n\\s*modulerc/dir2/1.0/rc1: modulerc/dir2/1.0/rc1\n\\s*modulerc/dir2/1.0/rc2: modulerc/dir2/1.0/rc2\n\\s*modulerc/dir2/2.0: modulerc/dir2/2.0\n\\s*modulerc/dir2/3.0: modulerc/dir2/3.0"
unset header

13
testsuite/modules.80-deep/068-transitive-deep.exp
View File

@@ -110,7 +110,7 @@ set module_10 "$module_9"
set modalt_10 $modalt_9
set modulefile_10 "$modulefile_9"
set modulefilere_10 "$modulefilere_9"
set modavail_10 "modtr/dir4/\\s+fld\\s+"
set modavail_10 [if_implicitdefault "modtr/dir4/\\s+fld\\s+\n$module_9\\s+$datetime_re" "modtr/dir4/\\s+fld\\s+"]
set nodefault_10 $nodefault_9
# alias set on sub-directory
@@ -199,7 +199,7 @@ set module_20 "$module_11"
set modalt_20 $modalt_11
set modulefile_20 "$modulefile_11"
set modulefilere_20 "$modulefilere_11"
set modavail_20 "modtr/dir5/subdir/\\s+dadj:sfld\\s+"
set modavail_20 [if_implicitdefault "modtr/dir5/subdir/\\s+dadj:sfld\\s+\n$module_11\\s+madj\\s+$datetime_re" "modtr/dir5/subdir/\\s+dadj:sfld\\s+"]
set nodefault_20 $nodefault_15
# symbol set on alias of modulefile of an adjacent sub-directory
@@ -452,24 +452,19 @@ for {set i 1} {$i <= 38} {incr i} {
testouterr_cmd_re "sh" "display $modsym" "OK" $displayerr
testouterr_cmd_re "sh" "help $modsym" "OK" $helperr
testouterr_cmd_re "sh" "test $modsym" "OK" $testerr
testouterr_cmd_re "sh" "whatis $modsym" "OK" $whatiserr
} else {
testouterr_cmd "sh" "load $modsym" [if_implicitdefault $ans ERR] [if_implicitdefault $modwarn $nodefaultwarn$nodefault]
testouterr_cmd_re "sh" "display $modsym" [if_implicitdefault OK ERR] [if_implicitdefault $displayerr $nodefaultwarn$nodefault]
testouterr_cmd_re "sh" "help $modsym" [if_implicitdefault OK ERR] [if_implicitdefault $helperr $nodefaultwarn$nodefault]
testouterr_cmd_re "sh" "test $modsym" [if_implicitdefault OK ERR] [if_implicitdefault $testerr $nodefaultwarn$nodefault]
testouterr_cmd_re "sh" "whatis $modsym" [if_implicitdefault OK ERR] [if_implicitdefault $whatiserr $nodefault]
}
testouterr_cmd_re "sh" "avail -l $modsym" "OK" "$avail_pre\n$modavail"
testouterr_cmd_re "sh" "whatis $modsym" "OK" $whatiserr
set ans [list]
lappend ans [list text $modulefile]
if {$nodefault eq {}} {
testouterr_cmd "sh" "paths $modsym" $ans "$modwarn"
} else {
testouterr_cmd "sh" "paths $modsym" [if_implicitdefault $ans [list [list text {}]]] [if_implicitdefault $modwarn [expr {!$modforcewarn ? $modwarn : {}}]]
}
testouterr_cmd "sh" "paths $modsym" $ans "$modwarn"
# setup environment for unload action
setenv_loaded_module $module $modulefile

2
testsuite/modules.90-avail/040-wild.exp
View File

@@ -167,7 +167,7 @@ set tserr_contains $modpathre.deep:\nmodtr/dir4/\\(default:fld:reg:trfld:trreg\\
testouterr_cmd_re csh {avail -C -t dir4} OK $tserr_contains
set tserr_contains $modpathre.deep:\nmodtr/dir1/1.0\\(cur:stable\\)\nmodtr/dir2/2.0\\(next:tr2unstable:trunstable:unstable\\)\nmodtr/dir3/al2\\(bar:default:exp:reg:tr2bar:trbar:@\\)\nmodtr/dir3/al3\\(default:exp:reg:@\\)\nmodtr/dir4/\\(default:fld:reg:trfld:trreg\\)\nmodtr/dir4/al7\\(madj:@\\)\nmodtr/dir4/al8\\(dadj:@\\)\nmodtr/dir4/mod4.0\nmodtr/dir5/subdir/\\(dadj:sfld\\)\nmodtr/dir5/subdir/mod5.0\\(madj\\)
testouterr_cmd_re csh {avail -C -t tr/dir} OK $tserr_contains
set tserr_contains $modpathre.deep:\nmodulerc/dir2/1.0/\\(default\\)\nmodulerc/dir2/1.0/rc1\\(default\\)\nmodulerc/dir2/1.0/rc2
set tserr_contains $modpathre.deep:\nmodulerc/dir2/1.0/\\(default:foo\\)\nmodulerc/dir2/1.0/rc1\\(default:foo\\)\nmodulerc/dir2/1.0/rc2
testouterr_cmd_re csh {avail -C -t rc/dir2/1} OK $tserr_contains

35
testsuite/modules.90-avail/070-full.exp
View File

@@ -169,8 +169,9 @@ modtr/dir5/subdir/mod5.0(madj)
modulerc/dir1/(default)
modulerc/dir1/1.0(default)
modulerc/dir1/2.0
modulerc/dir2/1.0/(default)
modulerc/dir2/1.0/rc1(default)
modulerc/dir2/(foo)
modulerc/dir2/1.0/(default:foo)
modulerc/dir2/1.0/rc1(default:foo)
modulerc/dir2/1.0/rc2
modulerc/dir2/2.0
modulerc/dir2/3.0
@@ -241,6 +242,7 @@ modtr/dir5/subdir/mod5.0
modulerc/dir1/
modulerc/dir1/1.0
modulerc/dir1/2.0
modulerc/dir2/
modulerc/dir2/1.0/
modulerc/dir2/1.0/rc1
modulerc/dir2/1.0/rc2
@@ -280,20 +282,21 @@ set len [string length $modpath.deep]
set lrep [expr {($test_cols_othos - $len - 2)/2}]
set rrep [expr {$test_cols_othos - $len - 2 - $lrep}]
set ts_sh_noflag_othos "[string repeat {-} $lrep] $modpath.deep [string repeat {-} $rrep]
badmodvers/dir1/2.0 modload/dir2/1.0 modtr/dir4/al7 modvirt/3.0 tr2mod/dir3/al2
badmodvers/foo modload/dir2/3.0 modtr/dir4/al8 modvirt/dir0/sub1/4.0 trmod/
dir2/1.0 modsym/dir1/1.0 modtr/dir4/mod4.0 modvirt/dir0/sub1/5.0 trmod/al1
dir2/3.0 modsym/dir2/2.0 modtr/dir5/subdir/ modvirt/dir0/sub1/6.0 trmod/al5
modalias/1.0 modtr/3.0 modtr/dir5/subdir/mod5.0 modvirt/dir1/1.0 trmod/dir3/
modalias/3.0 modtr/al1 modulerc/dir1/ modvirt/dir1/2.0 trmod/dir3/al2
modalias/dir1/1.0 modtr/al4 modulerc/dir1/1.0 modvirt/dir2/2.0 version/dir1/
modalias/dir1/2.0 modtr/al5 modulerc/dir1/2.0 modvirt/dir2/3.0 version/dir1/1.0
modalias/dir2/2.0 modtr/al6 modulerc/dir2/1.0/ plain/dir1/1.0 version/dir1/2.0
modalias/dir2/3.0 modtr/dir1/1.0 modulerc/dir2/1.0/rc1 plain/dir1/2.0 version/dir2/1.0
moddalias modtr/dir2/2.0 modulerc/dir2/1.0/rc2 plain/dir2/1.0 version/dir2/2.0/
moddalias/dir1/1 modtr/dir3/al2 modulerc/dir2/2.0 plain/dir2/2.0 version/dir2/2.0/rc1
moddef/dir2/1.0 modtr/dir3/al3 modulerc/dir2/3.0 tr2mod/al1 version/dir2/2.0/rc2
moddef/dir2/2.0 modtr/dir4/ modvirt/1.0 tr2mod/al5 version/dir2/3.0 "
badmodvers/dir1/2.0 modload/dir2/3.0 modtr/dir4/mod4.0 modvirt/dir0/sub1/5.0 trmod/al5
badmodvers/foo modsym/dir1/1.0 modtr/dir5/subdir/ modvirt/dir0/sub1/6.0 trmod/dir3/
dir2/1.0 modsym/dir2/2.0 modtr/dir5/subdir/mod5.0 modvirt/dir1/1.0 trmod/dir3/al2
dir2/3.0 modtr/3.0 modulerc/dir1/ modvirt/dir1/2.0 version/dir1/
modalias/1.0 modtr/al1 modulerc/dir1/1.0 modvirt/dir2/2.0 version/dir1/1.0
modalias/3.0 modtr/al4 modulerc/dir1/2.0 modvirt/dir2/3.0 version/dir1/2.0
modalias/dir1/1.0 modtr/al5 modulerc/dir2/ plain/dir1/1.0 version/dir2/1.0
modalias/dir1/2.0 modtr/al6 modulerc/dir2/1.0/ plain/dir1/2.0 version/dir2/2.0/
modalias/dir2/2.0 modtr/dir1/1.0 modulerc/dir2/1.0/rc1 plain/dir2/1.0 version/dir2/2.0/rc1
modalias/dir2/3.0 modtr/dir2/2.0 modulerc/dir2/1.0/rc2 plain/dir2/2.0 version/dir2/2.0/rc2
moddalias modtr/dir3/al2 modulerc/dir2/2.0 tr2mod/al1 version/dir2/3.0
moddalias/dir1/1 modtr/dir3/al3 modulerc/dir2/3.0 tr2mod/al5
moddef/dir2/1.0 modtr/dir4/ modvirt/1.0 tr2mod/dir3/al2
moddef/dir2/2.0 modtr/dir4/al7 modvirt/3.0 trmod/
modload/dir2/1.0 modtr/dir4/al8 modvirt/dir0/sub1/4.0 trmod/al1 "
#
# test