Skip to content

Commit c0881ba

Browse files
committed
ts: report nearly-forbidden warning only after module eval
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent 4dd66bc commit c0881ba

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

testsuite/modules.20-locate/115-forbid.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ if {$install_nearlyforbiddendays >= 1} {
739739
}
740740
setenv_var MODULES_NEARLY_FORBIDDEN_DAYS 1
741741
testouterr_cmd sh {load hide1/5.0} $ans [msg_load {hide1/5.0 <nF>} [err_accessnearlydenied $tomorrow]]
742-
testouterr_cmd_re sh {display hide1/5.0} OK "$modlin\n$mpre/hide1/5.0:\n\n[err_accessnearlydenied $tomorrow]\nmodule-whatis\thide1/5.0\n$modlin"
742+
testouterr_cmd_re sh {display hide1/5.0} OK "$modlin\n$mpre/hide1/5.0:\n\nmodule-whatis\thide1/5.0\n[err_accessnearlydenied $tomorrow]\n$modlin"
743743
testouterr_cmd_re sh {whatis hide1/5.0} OK "$modlin $mpre $modlin\n\\s+hide1/5.0: hide1/5.0"
744744
testouterr_cmd sh {avail -t hide1/5.0} OK "$mp:\nhide1/5.0 <nF>"
745745
setenv_loaded_module [list hide1/5.0] [list $mp/hide1/5.0]

testsuite/modules.50-cmds/288-info-tags.exp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ skip_if_quick_mode
6969
set tserr "$modlin
7070
$mpre/info/tags:
7171

72-
[err_accessnearlydenied $tomorrow]
7372
setenv\t\tTS1 nearly-forbidden
7473
setenv\t\tTS2 0
7574
setenv\t\tTS3 0
7675
setenv\t\tTS4 0
7776
setenv\t\tTS5 1
77+
[err_accessnearlydenied $tomorrow]
7878
$modlin"
7979
testouterr_cmd_re sh {show info/tags} OK $tserr
8080

@@ -133,12 +133,12 @@ setenv_var __MODULES_LMTAG info/tags&nearly-forbidden&foo&auto-loaded
133133
set tserr "$modlin
134134
$mpre/info/tags:
135135

136-
[err_accessnearlydenied {}]
137136
setenv\t\tTS1 {auto-loaded foo nearly-forbidden}
138137
setenv\t\tTS2 1
139138
setenv\t\tTS3 0
140139
setenv\t\tTS4 1
141140
setenv\t\tTS5 1
141+
[err_accessnearlydenied {}]
142142
$modlin"
143143
testouterr_cmd_re sh {show info/tags} OK $tserr
144144

0 commit comments

Comments
 (0)