Skip to content

Commit 0996f8f

Browse files
xdelaruellexdelaruelle
committed
ts: record requirement modulepath spec in environment
1 parent 4900b8f commit 0996f8f

File tree

2 files changed

+53
-0
lines changed

2 files changed

+53
-0
lines changed

‎testsuite/modules.50-cmds/640-modulepath-opt.exp‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ set ans [list]
164164
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&unk/1|qux/1]
165165
lappend ans [list set _LMFILES_ $mp/qux/1:$mp/modulepath-opt/1]
166166
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
167+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&unk/1|qux/1&$mp|$modpath.3]
167168
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
168169

169170

@@ -179,6 +180,7 @@ lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1:qux/1&modulepath
179180
lappend ans [list set _LMFILES_ $mp/modulepath-opt/1:$mp/qux/1]
180181
lappend ans [list set LOADEDMODULES modulepath-opt/1:qux/1]
181182
lappend ans [list set __MODULES_LMTAG modulepath-opt/1&auto-loaded]
183+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$mp|$modpath.3]
182184
set tserr [msg_top_load qux/1 {} modulepath-opt/1 {}]
183185
testouterr_cmd sh {load --no-auto qux/1} $ans $tserr
184186

@@ -202,12 +204,27 @@ lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
202204
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
203205

204206
setenv_var TESTSUITE_MODULEPATH_OPT dir4
207+
set ans [list]
208+
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1]
209+
lappend ans [list set _LMFILES_ $mp/qux/1:$mp/modulepath-opt/1]
210+
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
211+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$modpath.3|$mp]
205212
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
206213

207214
setenv_var TESTSUITE_MODULEPATH_OPT dir5
215+
set ans [list]
216+
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1]
217+
lappend ans [list set _LMFILES_ $mp/qux/1:$mp/modulepath-opt/1]
218+
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
219+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$mp]
208220
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
209221

210222
setenv_var TESTSUITE_MODULEPATH_OPT dir7
223+
set ans [list]
224+
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1]
225+
lappend ans [list set _LMFILES_ $mp/qux/1:$mp/modulepath-opt/1]
226+
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
227+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$env(TESTSUITEDIR)]
211228
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
212229

213230

@@ -223,6 +240,7 @@ set ans [list]
223240
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux@1<2]
224241
lappend ans [list set _LMFILES_ $modpath.3/qux/1:$mp/modulepath-opt/1]
225242
lappend ans [list set LOADEDMODULES qux/2:modulepath-opt/1]
243+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux@1<2&$modpath.3]
226244
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
227245

228246
setenv_var TESTSUITE_MODULEPATH_OPT virt2
@@ -244,6 +262,7 @@ set ans [list]
244262
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&$modpath.3/qux/1]
245263
lappend ans [list set _LMFILES_ $modpath.3/qux/1:$mp/modulepath-opt/1]
246264
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
265+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&$modpath.3/qux/1&$modpath.3]
247266
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
248267

249268
setenv_var TESTSUITE_MODULEPATH_OPT full_path2
@@ -258,6 +277,7 @@ set ans [list]
258277
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&$modpath.3/qux/1]
259278
lappend ans [list set _LMFILES_ $modpath.3/qux/1:$mp/modulepath-opt/1]
260279
lappend ans [list set LOADEDMODULES $modpath.3/qux/1:modulepath-opt/1]
280+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&$modpath.3/qux/1&$modpath.3]
261281
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
262282

263283
setenv_var TESTSUITE_MODULEPATH_OPT full_path2
@@ -276,6 +296,7 @@ set ans [list]
276296
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&$mp/qux/1]
277297
lappend ans [list set _LMFILES_ $mp/qux/1:$mp/modulepath-opt/1]
278298
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
299+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&$mp/qux/1&$modpath.3]
279300
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
280301

281302

@@ -291,6 +312,7 @@ set ans [list]
291312
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&$mp/qux/1]
292313
lappend ans [list set _LMFILES_ $mp/qux/1:$mp/modulepath-opt/1]
293314
lappend ans [list set LOADEDMODULES $mp/qux/1:modulepath-opt/1]
315+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&$mp/qux/1&$modpath.3]
294316
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
295317

296318

@@ -309,12 +331,18 @@ set ans [list]
309331
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1]
310332
lappend ans [list set _LMFILES_ $mp/qux/1:$mp/modulepath-opt/1]
311333
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
334+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$mp]
312335
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
313336

314337
setenv_var TESTSUITE_MODULEPATH_OPT rel_path3
315338
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
316339

317340
setenv_var TESTSUITE_MODULEPATH_OPT rel_path4
341+
set ans [list]
342+
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1]
343+
lappend ans [list set _LMFILES_ $mp/qux/1:$mp/modulepath-opt/1]
344+
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
345+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$mp|$modpath.3]
318346
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
319347

320348

@@ -325,6 +353,7 @@ set ans [list]
325353
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1]
326354
lappend ans [list set _LMFILES_ $modpath.3/qux/1:$mp/modulepath-opt/1]
327355
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
356+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$modpath.3]
328357
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
329358

330359
setenv_var TESTSUITE_MODULEPATH_OPT rel_path2
@@ -336,6 +365,11 @@ set tserr [msg_load modulepath-opt/1 [err_prereq_path qux/1]]
336365
testouterr_cmd sh {load --no-auto modulepath-opt/1} ERR $tserr
337366

338367
setenv_var TESTSUITE_MODULEPATH_OPT rel_path4
368+
set ans [list]
369+
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1]
370+
lappend ans [list set _LMFILES_ $modpath.3/qux/1:$mp/modulepath-opt/1]
371+
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
372+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$mp|$modpath.3]
339373
testouterr_cmd sh {load --no-auto modulepath-opt/1} $ans {}
340374

341375

@@ -369,6 +403,7 @@ set ans [list]
369403
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1]
370404
lappend ans [list set _LMFILES_ $modpath.3/qux/1:$mp/modulepath-opt/1]
371405
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
406+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$modpath.3]
372407
lappend ans [list set __MODULES_LMTAG qux/1&auto-loaded]
373408
set tserr [msg_top_load modulepath-opt/1 {} qux/1 {}]
374409
testouterr_cmd sh {load --auto modulepath-opt/1} $ans $tserr
@@ -381,6 +416,12 @@ testouterr_cmd sh {load --auto modulepath-opt/1} $ans $tserr
381416
setenv_path_var MODULEPATH $mp
382417

383418
setenv_var TESTSUITE_MODULEPATH_OPT dir4
419+
set ans [list]
420+
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1]
421+
lappend ans [list set _LMFILES_ $modpath.3/qux/1:$mp/modulepath-opt/1]
422+
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
423+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$modpath.3|$mp]
424+
lappend ans [list set __MODULES_LMTAG qux/1&auto-loaded]
384425
testouterr_cmd sh {load --auto modulepath-opt/1} $ans $tserr
385426

386427
setenv_var TESTSUITE_MODULEPATH_OPT dir6
@@ -392,6 +433,7 @@ set ans [list]
392433
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1]
393434
lappend ans [list set _LMFILES_ $mp/qux/1:$mp/modulepath-opt/1]
394435
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
436+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$env(TESTSUITEDIR)]
395437
lappend ans [list set __MODULES_LMTAG qux/1&auto-loaded]
396438
set tserr [msg_top_load modulepath-opt/1 {} qux/1 {}]
397439
testouterr_cmd sh {load --auto modulepath-opt/1} $ans $tserr
@@ -401,6 +443,7 @@ set ans [list]
401443
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1]
402444
lappend ans [list set _LMFILES_ $modpath.3/qux/1:$mp/modulepath-opt/1]
403445
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
446+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$env(TESTSUITEDIR)]
404447
lappend ans [list set __MODULES_LMTAG qux/1&auto-loaded]
405448
set tserr [msg_top_load modulepath-opt/1 {} qux/1 {}]
406449
testouterr_cmd sh {load --auto modulepath-opt/1} $ans $tserr
@@ -423,6 +466,7 @@ set ans [list]
423466
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&unk/1|qux/1]
424467
lappend ans [list set _LMFILES_ $mp/qux/1:$mp/modulepath-opt/1]
425468
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
469+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&unk/1|qux/1&$mp|$modpath.3]
426470
lappend ans [list set __MODULES_LMTAG qux/1&auto-loaded]
427471
set tserr [msg_top_load modulepath-opt/1 {} qux/1 {}]
428472
testouterr_cmd sh {load --auto modulepath-opt/1} $ans $tserr
@@ -437,6 +481,7 @@ lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1:qux/1&modulepath
437481
lappend ans [list set _LMFILES_ $mp/modulepath-opt/1:$mp/qux/1]
438482
lappend ans [list set LOADEDMODULES modulepath-opt/1:qux/1]
439483
lappend ans [list set __MODULES_LMTAG modulepath-opt/1&auto-loaded]
484+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$mp|$modpath.3]
440485
set tserr [msg_top_load qux/1 {} modulepath-opt/1 {}]
441486
testouterr_cmd sh {load --auto qux/1} $ans $tserr
442487

@@ -460,6 +505,7 @@ set ans [list]
460505
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1]
461506
lappend ans [list set _LMFILES_ $mp/qux/1:$mp/modulepath-opt/1]
462507
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
508+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$mp]
463509
testouterr_cmd sh {load --auto modulepath-opt/1} $ans {}
464510

465511
setenv_var TESTSUITE_MODULEPATH_OPT dir3

‎testsuite/modules.50-cmds/641-modulepath-loaded.exp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ unsetenv_var MODULES_ADVANCED_VERSION_SPEC
7373
setenv_var TESTSUITE_MODULEPATH_OPT loaded_after_from_other_dir
7474
setenv_loaded_module [list modulepath-opt/1] [list $mp/modulepath-opt/1]
7575
setenv_var __MODULES_LMPREREQ modulepath-opt/1&qux/1
76+
setenv_var __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$modpath.3
7677

7778
#FIXME: modulepath-opt/1 should not get reloaded as mp4/qux/1 is not a requirement
7879
set tserr [msg_load modulepath-opt/1 [err_prereq_path qux/1]]\n\n[msg_load qux/1 [err_depre modulepath-opt/1]]
@@ -86,11 +87,13 @@ testouterr_cmd sh {load --auto qux/1} ERR $tserr
8687
setenv_var TESTSUITE_MODULEPATH_OPT loaded_after_from_correct_dir
8788
setenv_loaded_module [list modulepath-opt/1] [list $mp/modulepath-opt/1]
8889
setenv_var __MODULES_LMPREREQ modulepath-opt/1&qux/1
90+
setenv_var __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$mp
8991

9092
set ans [list]
9193
lappend ans [list set __MODULES_LMPREREQ modulepath-opt/1&qux/1]
9294
lappend ans [list set _LMFILES_ $mp/qux/1:$mp/modulepath-opt/1]
9395
lappend ans [list set LOADEDMODULES qux/1:modulepath-opt/1]
96+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$mp]
9497
set tserr [msg_top_load qux/1 {} {} modulepath-opt/1]
9598
testouterr_cmd sh {load --auto qux/1} $ans $tserr
9699

@@ -104,6 +107,7 @@ setenv_var TESTSUITE_MODULEPATH_OPT depre_trigger
104107
# dependency from bad modulepath is loaded
105108
setenv_loaded_module [list qux/1 modulepath-opt/1] [list $mp/qux/1 $mp/modulepath-opt/1]
106109
setenv_var __MODULES_LMPREREQ qux/1&qux/1|foo/1.0:modulepath-opt/1&qux/1
110+
setenv_var __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$modpath.3
107111

108112
#FIXME: modulepath-opt/1 should not get reloaded as mp4/qux/1 is not a requirement
109113
set tserr [msg_load modulepath-opt/1 [err_prereq_path qux/1]]\n\n[msg_load foo/1.0 [err_depre modulepath-opt/1]]
@@ -119,6 +123,7 @@ set ans [list]
119123
lappend ans [list set __MODULES_LMPREREQ qux/1&qux/1|foo/1.0:modulepath-opt/1&qux/1]
120124
lappend ans [list set _LMFILES_ $modpath.3/foo/1.0:$modpath.3/qux/1:$mp/modulepath-opt/1]
121125
lappend ans [list set LOADEDMODULES foo/1.0:qux/1:modulepath-opt/1]
126+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$modpath.3]
122127
set tserr [msg_top_load foo/1.0 {} {} {qux/1 modulepath-opt/1}]
123128
testouterr_cmd sh {load --auto foo/1.0} $ans $tserr
124129
setenv_var MODULEPATH $mp
@@ -127,6 +132,7 @@ setenv_var MODULEPATH $mp
127132
# dependency from expected modulepath is loaded
128133
setenv_loaded_module [list qux/1 modulepath-opt/1] [list $modpath.3/qux/1 $mp/modulepath-opt/1]
129134
setenv_var __MODULES_LMPREREQ qux/1&qux/1|foo/1.0:modulepath-opt/1&qux/1
135+
setenv_var __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$modpath.3
130136

131137
# qux/1 is reloaded from mp4 as it is the enabled modulepath
132138
set tserr [msg_load modulepath-opt/1 [err_reqmis_path qux/1]]\n\n[msg_load foo/1.0 [err_depre modulepath-opt/1]]
@@ -142,6 +148,7 @@ set ans [list]
142148
lappend ans [list set __MODULES_LMPREREQ qux/1&qux/1|foo/1.0:modulepath-opt/1&qux/1]
143149
lappend ans [list set _LMFILES_ $modpath.3/foo/1.0:$modpath.3/qux/1:$mp/modulepath-opt/1]
144150
lappend ans [list set LOADEDMODULES foo/1.0:qux/1:modulepath-opt/1]
151+
lappend ans [list set __MODULES_LMPREREQPATH modulepath-opt/1&qux/1&$modpath.3]
145152
set tserr [msg_top_load foo/1.0 {} {} {qux/1 modulepath-opt/1}]
146153
testouterr_cmd sh {load --auto foo/1.0} $ans $tserr
147154
setenv_var MODULEPATH $mp

0 commit comments

Comments
 (0)