Skip to content

Commit dad3a3f

Browse files
xdelaruellexdelaruelle
committed
ts: extend test adaptation for path_entry_reorder
Signed-off-by: Xavier Delaruelle <xavier.delaruelle@cea.fr>
1 parent 94ad253 commit dad3a3f

File tree

10 files changed

+303
-54
lines changed

10 files changed

+303
-54
lines changed

‎testsuite/modules.10-use/030-use.exp‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,11 @@ set ans [list]
147147
lappend ans [list set MODULEPATH $modpath]
148148
testouterr_cmd sh "$use $modpath" $ans {}
149149
set ans [list]
150-
lappend ans [list set MODULEPATH $path:/tmp:$modpath]
150+
if {[is_conf_enabled pathentryreorder]} {
151+
lappend ans [list set MODULEPATH $modpath:$path:/tmp]
152+
} else {
153+
lappend ans [list set MODULEPATH $path:/tmp:$modpath]
154+
}
151155
testouterr_cmd sh "$use $modpath $path:/tmp" $ans {}
152156

153157
# erroneous __MODULES_SHARE_ ref counter variable is fixed
@@ -158,7 +162,11 @@ lappend ans [list set MODULEPATH $modpath]
158162
testouterr_cmd sh "$use $modpath" $ans {}
159163
set ans [list]
160164
lappend ans [list unset __MODULES_SHARE_MODULEPATH]
161-
lappend ans [list set MODULEPATH $path:/tmp:$modpath]
165+
if {[is_conf_enabled pathentryreorder]} {
166+
lappend ans [list set MODULEPATH $modpath:$path:/tmp]
167+
} else {
168+
lappend ans [list set MODULEPATH $path:/tmp:$modpath]
169+
}
162170
testouterr_cmd sh "$use $modpath $path:/tmp" $ans {}
163171

164172
# erroneous __MODULES_SHARE_ ref counter variable is fixed
@@ -169,7 +177,11 @@ lappend ans [list set MODULEPATH $modpath]
169177
testouterr_cmd sh "$use $modpath" $ans {}
170178
set ans [list]
171179
lappend ans [list unset __MODULES_SHARE_MODULEPATH]
172-
lappend ans [list set MODULEPATH $path:/tmp:$modpath]
180+
if {[is_conf_enabled pathentryreorder]} {
181+
lappend ans [list set MODULEPATH $modpath:$path:/tmp]
182+
} else {
183+
lappend ans [list set MODULEPATH $path:/tmp:$modpath]
184+
}
173185
testouterr_cmd sh "$use $modpath:$path /tmp" $ans {}
174186

175187
# __MODULES_SHARE_ ref counter variable is ignored
@@ -180,7 +192,11 @@ lappend ans [list set MODULEPATH $modpath]
180192
testouterr_cmd sh "$use $modpath" $ans {}
181193
set ans [list]
182194
lappend ans [list set __MODULES_SHARE_MODULEPATH $modpath:2]
183-
lappend ans [list set MODULEPATH $path:/tmp:$modpath]
195+
if {[is_conf_enabled pathentryreorder]} {
196+
lappend ans [list set MODULEPATH $modpath:$path:/tmp]
197+
} else {
198+
lappend ans [list set MODULEPATH $path:/tmp:$modpath]
199+
}
184200
testouterr_cmd sh "$use $modpath:$path:/tmp" $ans {}
185201

186202
unsetenv_var __MODULES_SHARE_MODULEPATH

‎testsuite/modules.50-cmds/400-source-sh.exp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ setenv_path_var MODULEPATH $mp
2929
setenv_var TESTSUITE_SHTOMOD_PATHDUP 1
3030
setenv_var TESTSUITE_SHTOMOD_NOCOMP 1
3131

32+
setenv_var MODULES_PATH_ENTRY_REORDER 0
3233

3334
#
3435
# load and unload tests

‎testsuite/modules.50-cmds/501-append-on-unload.exp‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,11 @@ testouterr_cmd sh "unload $mod" $ans {}
157157
setenv_path_var FOO /tmp:/dir1
158158
set ans [list]
159159
lappend ans [list set __MODULES_SHARE_FOO /tmp:2]
160-
lappend ans [list set FOO /tmp:/dir1]
160+
if {[is_conf_enabled pathentryreorder]} {
161+
lappend ans [list set FOO /dir1:/tmp]
162+
} else {
163+
lappend ans [list set FOO /tmp:/dir1]
164+
}
161165
lappend ans [list unset _LMFILES_]
162166
lappend ans [list unset LOADEDMODULES]
163167
testouterr_cmd sh "unload $mod" $ans {}
@@ -551,15 +555,23 @@ setenv_loaded_module [list $mod] [list $modfile]
551555
setenv_path_var FOO /tmp {}
552556
set ans [list]
553557
lappend ans [list set __MODULES_SHARE_FOO /tmp:2::2]
554-
lappend ans [list set FOO /tmp:]
558+
if {[is_conf_enabled pathentryreorder]} {
559+
lappend ans [list set FOO :/tmp]
560+
} else {
561+
lappend ans [list set FOO /tmp:]
562+
}
555563
lappend ans [list unset _LMFILES_]
556564
lappend ans [list unset LOADEDMODULES]
557565
testouterr_cmd sh "unload $mod" $ans {}
558566

559567
setenv_path_var FOO /tmp
560568
set ans [list]
561569
lappend ans [list set __MODULES_SHARE_FOO :1:/tmp:2]
562-
lappend ans [list set FOO /tmp:]
570+
if {[is_conf_enabled pathentryreorder]} {
571+
lappend ans [list set FOO :/tmp]
572+
} else {
573+
lappend ans [list set FOO /tmp:]
574+
}
563575
lappend ans [list unset _LMFILES_]
564576
lappend ans [list unset LOADEDMODULES]
565577
testouterr_cmd sh "unload $mod" $ans {}
@@ -947,7 +959,11 @@ set ans [list]
947959
lappend ans [list unset _LMFILES_]
948960
lappend ans [list unset LOADEDMODULES]
949961
lappend ans [list set __MODULES_SHARE_MODULEPATH /tmp:2::1]
950-
lappend ans [list set MODULEPATH $mp:/tmp:]
962+
if {[is_conf_enabled pathentryreorder]} {
963+
lappend ans [list set MODULEPATH ${mp}::/tmp]
964+
} else {
965+
lappend ans [list set MODULEPATH $mp:/tmp:]
966+
}
951967
lappend ans [list ERR]
952968
set tserr [msg_unload $mod $err_emptydirname]
953969
testouterr_cmd sh "unload $mod" $ans $tserr

‎testsuite/modules.50-cmds/502-prepend-on-unload.exp‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,11 @@ testouterr_cmd sh "unload $mod" $ans {}
213213
setenv_var FOO /tmp
214214
set ans [list]
215215
lappend ans [list set __MODULES_SHARE_FOO /tmp:2]
216-
lappend ans [list set FOO /dir1:/tmp]
216+
if {[is_conf_enabled pathentryreorder]} {
217+
lappend ans [list set FOO /tmp:/dir1]
218+
} else {
219+
lappend ans [list set FOO /dir1:/tmp]
220+
}
217221
lappend ans [list unset _LMFILES_]
218222
lappend ans [list unset LOADEDMODULES]
219223
testouterr_cmd sh "unload $mod" $ans {}
@@ -370,7 +374,11 @@ testouterr_cmd sh "unload $mod" $ans {}
370374
setenv_var FOO /dir1
371375
set ans [list]
372376
lappend ans [list set __MODULES_SHARE_FOO /dir1:2]
373-
lappend ans [list set FOO /dir2:/dir1]
377+
if {[is_conf_enabled pathentryreorder]} {
378+
lappend ans [list set FOO /dir1:/dir2]
379+
} else {
380+
lappend ans [list set FOO /dir2:/dir1]
381+
}
374382
lappend ans [list unset _LMFILES_]
375383
lappend ans [list unset LOADEDMODULES]
376384
testouterr_cmd sh "unload $mod" $ans {}
@@ -560,7 +568,11 @@ setenv_loaded_module [list $mod] [list $modfile]
560568
setenv_path_var FOO /tmp {}
561569
set ans [list]
562570
lappend ans [list set __MODULES_SHARE_FOO /tmp:2::2]
563-
lappend ans [list set FOO /tmp:]
571+
if {[is_conf_enabled pathentryreorder]} {
572+
lappend ans [list set FOO :/tmp]
573+
} else {
574+
lappend ans [list set FOO /tmp:]
575+
}
564576
lappend ans [list unset _LMFILES_]
565577
lappend ans [list unset LOADEDMODULES]
566578
testouterr_cmd sh "unload $mod" $ans {}
@@ -703,7 +715,11 @@ set ans [list]
703715
lappend ans [list unset _LMFILES_]
704716
lappend ans [list unset LOADEDMODULES]
705717
lappend ans [list set __MODULES_SHARE_MODULEPATH /tmp:2]
706-
lappend ans [list set MODULEPATH /dir1:$mp:/tmp]
718+
if {[is_conf_enabled pathentryreorder]} {
719+
lappend ans [list set MODULEPATH /tmp:/dir1:$mp]
720+
} else {
721+
lappend ans [list set MODULEPATH /dir1:$mp:/tmp]
722+
}
707723
testouterr_cmd_re sh "unload $mod" $ans {}
708724

709725
# refresh
@@ -956,7 +972,11 @@ set ans [list]
956972
lappend ans [list unset _LMFILES_]
957973
lappend ans [list unset LOADEDMODULES]
958974
lappend ans [list set __MODULES_SHARE_MODULEPATH /tmp:2::1]
959-
lappend ans [list set MODULEPATH $mp:/tmp:]
975+
if {[is_conf_enabled pathentryreorder]} {
976+
lappend ans [list set MODULEPATH /tmp:$mp:]
977+
} else {
978+
lappend ans [list set MODULEPATH $mp:/tmp:]
979+
}
960980
lappend ans [list ERR]
961981
set tserr [msg_unload $mod $err_emptydirname]
962982
testouterr_cmd sh "unload $mod" $ans $tserr

0 commit comments

Comments
 (0)