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

testsuite: harden tests using '.*' regexp

Browse Source
This commit is contained in:
Xavier Delaruelle
2017-08-03 22:15:00 +02:00
parent dc3299d56a
commit bbada91fb0
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
testsuite/modules.00-init/015-version.exp
View File

@@ -37,5 +37,5 @@ set shell "sh"
# Check the version at first
#
testouterr_cmd_re "csh" "--version" "" "Modules Release $exp_vers.*"
testouterr_cmd_re "csh" "-V" "" "Modules Release $exp_vers.*"
testouterr_cmd_re "csh" "--version" "" "Modules Release $exp_vers \[0-9a-zA-Z\.\+\\-\]+ \\(\[0-9\-\]{10}\\)"
testouterr_cmd_re "csh" "-V" "" "Modules Release $exp_vers \[0-9a-zA-Z\.\+\\-\]+ \\(\[0-9\-\]{10}\\)"

4
testsuite/modules.20-locate/080-access.exp
View File

@@ -131,7 +131,7 @@ testouterr_cmd "sh" "load $m4" "ERR" "$access_msg '$lmf4'"
testouterr_cmd "sh" "display $m4" "ERR" "$access_msg '$lmf4'"
# no error on whatis/avail, other versions are listed
testouterr_cmd_re "sh" "whatis $m4" "OK" "$pheader\n\\s+$m4/2.0: $m4/2.0\n\\s+$m4/3.0: $m4/3.0"
testouterr_cmd_re "sh" "avail -t $m4" "" "$pheader\n$m4/2.0\\(.*\\)\n$m4/3.0\\(.*\\)"
testouterr_cmd_re "sh" "avail -t $m4" "" "$pheader\n$m4/2.0\\(\[a-z:\]+\\)\n$m4/3.0\\(\[a-z:\]+\\)"
restore_file_perms $lmf4
@@ -152,7 +152,7 @@ lappend ans [list set testsuite yes]
testouterr_cmd "sh" "load $m5" $ans ""
testouterr_cmd_re "sh" "display $m5" "OK" "$modlin\n$rlmf5:\n\nmodule-whatis\t$rlm5\nsetenv\t\ttestsuite\tyes\n$modlin"
testouterr_cmd_re "sh" "whatis $m5" "OK" "$pheader\n\\s+$rlm5: $rlm5"
testouterr_cmd_re "sh" "avail -t $m5" "" "$pheader\n$rlm5\\(.*\\)"
testouterr_cmd_re "sh" "avail -t $m5" "" "$pheader\n$rlm5\\(\[a-z:\]+\\)"
# keep file permissions as it is for next test

4
testsuite/modules.50-cmds/282-info-command.exp
View File

@@ -49,10 +49,10 @@ testerr_cmd "sh" "load $module" "load"
testerr_cmd_re "sh" "display $module" "$modlin\n$modulefile:\n\ndisplay\n$modlin"
# test whatis
testerr_cmd_re "sh" "whatis $module" "$header\n\\s+$module: whatis\n.*"
testerr_cmd_re "sh" "whatis $module" "$header\n\\s+$module: whatis(\\n\\s+\\S*$module\\S*: .*)*"
# test searching
testerr_cmd_re "sh" "search search" "$header\n\\s+$module: search\n.*"
testerr_cmd_re "sh" "search search" "$header\n\\s+$module: search(\\n\\s+\\S+: search)*"
# test sourcing
testerr_cmd "sh" "source $modulefile" "source"

2
testsuite/modules.50-cmds/283-info-command-exp.exp
View File

@@ -52,7 +52,7 @@ testerr_cmd_re "sh" "display $module" "$modlin\n$modulefile:\n\ndisplay\n$modlin
testerr_cmd_re "sh" "whatis $module" "$header\n\\s+$module: whatis"
# test searching
testerr_cmd_re "sh" "search search" "$header\n.*\n\\s+$module: search"
testerr_cmd_re "sh" "search search" "$header\n(\\s+\\S+: search\\n)*\\s+$module: search"
# test sourcing
testerr_cmd "sh" "source $modulefile" "source"

2
testsuite/modules.91-sort/030-whatis.exp
View File

@@ -24,7 +24,7 @@
#
##############################################################################
set wissep ": (.*)"
set wissep ": module version sort test"
set header "$modlin $MODULEPATH $modlin\n"
#