Skip to content

Commit e97562b

Browse files
committed
ts: extra specifier tests when --not-req option is set in 51/04{2,3}
1 parent fb896f2 commit e97562b

File tree

3 files changed

+44
-0
lines changed

3 files changed

+44
-0
lines changed

testsuite/modulefiles.4/extra/1.0

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,5 +230,20 @@ if {[info exists env(TESTSUITE_EXTRA)]} {
230230
uncomplete2 {
231231
uncomplete {}
232232
}
233+
load9 {
234+
module load --not-req xtfoo/1.0
235+
}
236+
unload3 {
237+
module unload --not-req [email protected]: xtbar/1.0
238+
}
239+
switch8 {
240+
module switch --not-req xtfoo xtbar
241+
}
242+
try-load2 {
243+
module try-load --not-req [email protected]: foo=val2 xtbar bar=val1
244+
}
245+
load-any2 {
246+
module load-any --not-req [email protected]: foo=val2 xtbar bar=val1
247+
}
233248
}
234249
}

testsuite/modules.51-scan/042-extra_spec-conflict.exp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ setenv_var TESTSUITE_EXTRA unload2
7474
testouterr_cmd sh {avail -t extra unload:xtbar} OK $tserr
7575
testouterr_cmd sh {avail -t extra incompat:xtbar/1.0} OK $tserr
7676

77+
# --not-req option
78+
setenv_var TESTSUITE_EXTRA unload3
79+
testouterr_cmd sh {avail -t extra unload:xtbar/1.0} OK $tserr
80+
testouterr_cmd sh {avail -t extra incompat:xtbar/1.0} OK {}
81+
7782

7883
#
7984
# conflict
@@ -112,6 +117,11 @@ setenv_var TESTSUITE_EXTRA switch5
112117
testouterr_cmd sh {avail -t extra incompat:xtfoo/1.0} OK {}
113118
testouterr_cmd sh {avail -t extra incompat:xtfoo} OK {}
114119

120+
# --not-req option
121+
setenv_var TESTSUITE_EXTRA switch8
122+
testouterr_cmd sh {avail -t extra switch-off:xtfoo/1.0} OK $tserr
123+
testouterr_cmd sh {avail -t extra incompat:xtfoo/1.0} OK {}
124+
115125

116126
#
117127
# Cleanup

testsuite/modules.51-scan/043-extra_spec-require.exp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,11 @@ testouterr_cmd sh {ml av -t extra load:extra/1.0} OK $tserr
345345
setenv_var TESTSUITE_EXTRA load8
346346
testouterr_cmd sh {ml av -t extra load:extra/1.0} OK {}
347347

348+
# --not-req option
349+
setenv_var TESTSUITE_EXTRA load9
350+
testouterr_cmd sh {ml av -t extra load:xtfoo} OK $tserr
351+
testouterr_cmd sh {ml av -t extra require:xtfoo} OK {}
352+
348353

349354
#
350355
# module erroneous commands
@@ -386,6 +391,10 @@ testouterr_cmd sh {avail -t extra try-load:xtbar} OK $tserr
386391
testouterr_cmd sh {avail -t extra try-load:xtfoo/1.0\ foo=val2} OK $tserr
387392
testouterr_cmd sh {avail -t extra require:[email protected]:1.1} OK $tserr
388393

394+
setenv_var TESTSUITE_EXTRA try-load2
395+
testouterr_cmd sh {avail -t extra try-load:xtfoo/1.0\ foo=val2} OK $tserr
396+
testouterr_cmd sh {avail -t extra require:xtfoo/1.0\ foo=val2} OK {}
397+
389398

390399
#
391400
# module load-any
@@ -397,6 +406,11 @@ testouterr_cmd sh {avail -t extra load-any:xtbar} OK $tserr
397406
testouterr_cmd sh {avail -t extra load-any:xtfoo/1.0\ foo=val2} OK $tserr
398407
testouterr_cmd sh {avail -t extra require:[email protected]:1.1} OK $tserr
399408

409+
# --not-req option
410+
setenv_var TESTSUITE_EXTRA load-any2
411+
testouterr_cmd sh {avail -t extra load-any:xtbar/1.0} OK $tserr
412+
testouterr_cmd sh {avail -t extra require:xtbar/1.0} OK {}
413+
400414

401415
#
402416
# module switch
@@ -451,6 +465,11 @@ testouterr_cmd sh {avail -t extra switch-off:[email protected]: switch-on:xtbar\ bar=val
451465
testouterr_cmd sh {avail -t extra switch-on:[email protected]:} OK {}
452466
testouterr_cmd sh {avail -t extra switch-off:xtbar} OK {}
453467

468+
# --not-req option
469+
setenv_var TESTSUITE_EXTRA switch8
470+
testouterr_cmd sh {avail -t extra switch-on:xtbar/1.0} OK $tserr
471+
testouterr_cmd sh {avail -t extra require:xtbar/1.0} OK {}
472+
454473

455474
#
456475
# Cleanup

0 commit comments

Comments
 (0)