Skip to content

Commit 101475d

Browse files
xdelaruellexdelaruelle
committed
ts: change approach with version req in cache file magic cookie
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent 1d3c4e7 commit 101475d

File tree

7 files changed

+33
-31
lines changed

7 files changed

+33
-31
lines changed

‎testsuite/modules.00-init/005-init_ts.exp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ send_user "\tInitializing the testsuite ...\n"
2929
# Modules release number
3030
set major_minor_rel [join [lrange [split $install_version .] 0 1] .]
3131

32+
set cache_mcookie_version 5.3
33+
3234
# test kind of sh-shell we have
3335
if {[file type /bin/sh] eq {link}} {
3436
set sh_kind [file readlink /bin/sh]
@@ -1191,7 +1193,7 @@ proc create_dummy_cachefile {mp} {
11911193
set cachefile $mp/.modulecache
11921194
send_user "\tCreating dummy cache file $cachefile\n"
11931195
set fid [open $cachefile w]
1194-
puts $fid "#%Module$::major_minor_rel"
1196+
puts $fid "#%Module$::cache_mcookie_version"
11951197
close $fid
11961198
}
11971199

‎testsuite/modules.30-cache/030-cachebuild.exp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ file mkdir $mp2
4949
setenv_path_var MODULEPATH $mp1:$mp2
5050
create_dummy_modulefile $mp1modfile
5151
set tserr [msg_create $mp1cache]\n\n[msg_create $mp2cache $warn_cache_nothingtorec]
52-
set tscache "#%Module$major_minor_rel"
52+
set tscache "#%Module$cache_mcookie_version"
5353
append tscache \n[list modulefile-content foo [file mtime $mp1modfile] #%Module #%Module\n]
5454
testouterrfile_cmd sh cachebuild OK $tserr $mp1cache $tscache
5555
file delete $mp1modfile
@@ -58,7 +58,7 @@ file delete $mp1modfile
5858
create_dummy_modulefile $mp1modfile
5959
create_dummy_cachefile $mp1
6060
set tserr [msg_create $mp1cache]\n\n[msg_create $mp2cache $warn_cache_nothingtorec]
61-
set tscache "#%Module$major_minor_rel"
61+
set tscache "#%Module$cache_mcookie_version"
6262
append tscache \n[list modulefile-content foo [file mtime $mp1modfile] #%Module #%Module\n]
6363
testouterrfile_cmd sh cachebuild OK $tserr $mp1cache $tscache
6464
file delete $mp1modfile
@@ -73,7 +73,7 @@ close [open $mpfile w]
7373

7474
# silent mode
7575
create_dummy_modulefile $mp1modfile
76-
set tscache "#%Module$major_minor_rel"
76+
set tscache "#%Module$cache_mcookie_version"
7777
append tscache \n[list modulefile-content foo [file mtime $mp1modfile] #%Module #%Module\n]
7878
append tscache \n[list modulefile-invalid qux invalid {Magic cookie '#%Module' missing}]
7979
testouterrfile_cmd sh {cachebuild -s} OK {} $mp1cache $tscache
@@ -88,7 +88,7 @@ file delete $mp1cache
8888
create_dummy_modulefile $mp2modfile
8989
setenv_path_var MODULEPATH $mpunk:$mp2
9090
set tserr [msg_create $mpunk/.modulecache "$error_msgs: '$mpunk' is not a directory"]\n\n[msg_create $mp2cache]
91-
set tscache "#%Module$major_minor_rel"
91+
set tscache "#%Module$cache_mcookie_version"
9292
append tscache \n[list modulefile-content bar [file mtime $mp2modfile] #%Module #%Module\n]
9393
testouterrfile_cmd sh cachebuild ERR $tserr $mp2cache $tscache
9494

@@ -130,7 +130,7 @@ setenv_path_var MODULEPATH $mp1:$mp2
130130
change_file_perms $mp1 $nowrite_perms
131131
create_dummy_modulefile $mp2modfile
132132
set tserr [msg_create $mp1cache $warn_cache_build_nowritable]\n\n[msg_create $mp2cache]
133-
set tscache "#%Module$major_minor_rel"
133+
set tscache "#%Module$cache_mcookie_version"
134134
append tscache \n[list modulefile-content bar [file mtime $mp2modfile] #%Module #%Module\n]
135135
testouterrfile_cmd sh cachebuild OK $tserr $mp2cache $tscache
136136
set tscache [couldnotopen_nofile $mp1cache]
@@ -143,7 +143,7 @@ create_dummy_modulefile $mp1modfile
143143
create_dummy_modulefile $mp2modfile
144144
change_file_perms $mp1 $nowrite_perms
145145
set tserr [msg_create $mp1cache $warn_cache_build_nowritable]\n\n[msg_create $mp2cache]
146-
set tscache "#%Module$major_minor_rel"
146+
set tscache "#%Module$cache_mcookie_version"
147147
append tscache \n[list modulefile-content bar [file mtime $mp2modfile] #%Module #%Module\n]
148148
testouterrfile_cmd sh cachebuild OK $tserr $mp2cache $tscache
149149
set tscache [couldnotopen_nofile $mp1cache]
@@ -200,7 +200,7 @@ change_file_perms $mp2cache $nowrite_perms
200200
set tserr [msg_create $mp1cache]\n\n[msg_create $mp2cache [err_couldnotopen_permdenied $mp2cache]]
201201
set tscache [couldnotopen_permdenied $mp1cache]
202202
testouterrfile_cmd sh cachebuild ERR $tserr $mp1cache $tscache
203-
set tscache "#%Module$major_minor_rel"
203+
set tscache "#%Module$cache_mcookie_version"
204204
testouterrfile_cmd sh cachebuild ERR $tserr $mp2cache $tscache
205205
file delete $mp1modfile
206206
file delete $mp2modfile
@@ -218,7 +218,7 @@ change_file_perms $mp2cache $nowrite_perms
218218
set tserr [msg_create $mp1cache]\n\n[msg_create $mp2cache [err_couldnotopen_permdenied $mp2cache]]
219219
set tscache [couldnotopen_permdenied $mp1cache]
220220
testouterrfile_cmd sh "cachebuild $mp1 $mp2" ERR $tserr $mp1cache $tscache
221-
set tscache "#%Module$major_minor_rel"
221+
set tscache "#%Module$cache_mcookie_version"
222222
set tserr [msg_create $mp2cache [err_couldnotopen_permdenied $mp2cache]]\n\n[msg_create $mp1cache]
223223
testouterrfile_cmd sh "cachebuild $mp2 $mp1" ERR $tserr $mp2cache $tscache
224224
file delete $mp1modfile
@@ -236,7 +236,7 @@ if {$is_stderr_tty} {
236236
create_dummy_modulefile $mp2modfile
237237
change_file_perms $mp1 $nowrite_perms
238238
set tserr [msg_create $mp1cache [err_couldnotopen_permdenied $mp1cache]]\n\n[msg_create $mp2cache]
239-
set tscache "#%Module$major_minor_rel"
239+
set tscache "#%Module$cache_mcookie_version"
240240
append tscache \n[list modulefile-content bar [file mtime $mp2modfile] #%Module #%Module\n]
241241
testouterrfile_cmd sh cachebuild ERR $tserr $mp2cache $tscache
242242
set tscache [couldnotopen_nofile $mp1cache]

‎testsuite/modules.30-cache/031-cachebuild-full.exp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ lassign [create_diverse_module_setup $mp1] dir_list file_list
3434
array set file_arr $file_list
3535

3636
# expected cache file
37-
set tscache "#%Module$major_minor_rel"
37+
set tscache "#%Module$cache_mcookie_version"
3838
foreach f [lsort [array names file_arr]] {
3939
set entry {}
4040
switch -- $f {
@@ -143,7 +143,7 @@ setenv_path_var MODULEPATH $mp2:$mp1
143143
# one modulefile not readable
144144
change_file_perms $mp2/bar/1.0 $noread_perms
145145
set tserr [msg_create $mp2cache]\n[msg_create $mp1cache]
146-
set tscache "#%Module$major_minor_rel"
146+
set tscache "#%Module$cache_mcookie_version"
147147
foreach f [lsort [array names other_file_arr]] {
148148
switch -- $f {
149149
bar/1.0 {
@@ -166,7 +166,7 @@ restore_file_perms $mp2/bar/1.0
166166
# one modulerc not readable
167167
change_file_perms $mp2/foo/.modulerc $noread_perms
168168
set tserr [msg_create $mp2cache]\n[msg_create $mp1cache]
169-
set tscache "#%Module$major_minor_rel"
169+
set tscache "#%Module$cache_mcookie_version"
170170
foreach f [lsort [array names other_file_arr]] {
171171
set entry {}
172172
switch -- $f {
@@ -192,7 +192,7 @@ restore_file_perms $mp2/foo/.modulerc
192192
# one directory not readable
193193
change_file_perms $mp2/foo $noread_perms
194194
set tserr [msg_create $mp2cache]\n[msg_create $mp1cache]
195-
set tscache "#%Module$major_minor_rel"
195+
set tscache "#%Module$cache_mcookie_version"
196196
foreach f [lsort [array names other_file_arr]] {
197197
set entry {}
198198
switch -- $f {
@@ -223,7 +223,7 @@ if {$is_stderr_tty} {
223223
# test a modulefile read failure during cache build by faking modulefile is readable
224224
setenv_var TESTSUITE_ENABLE_SITECONFIG_CACHEBUILD_READ1 1
225225
set tserr [msg_create $mp2cache]\n[msg_create $mp1cache]
226-
set tscache "#%Module$major_minor_rel"
226+
set tscache "#%Module$cache_mcookie_version"
227227
foreach f [lsort [array names other_file_arr]] {
228228
set entry {}
229229
switch -- $f {

‎testsuite/modules.30-cache/032-cachebuild-limited-access.exp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ array set file_arr [concat $file_list $other_file_list]
3636

3737

3838
# expected cache file when no limited access
39-
set tscache "#%Module$major_minor_rel"
39+
set tscache "#%Module$cache_mcookie_version"
4040
foreach f [lsort [array names file_arr]] {
4141
set entry {}
4242
switch -- $f {
@@ -105,7 +105,7 @@ change_file_perms $mp1/quxc/1.0~ $no_arx_perms
105105
change_file_perms $mp1/.svn $no_arx_perms
106106
change_file_perms $mp1/.sos/ignmod $no_arx_perms
107107

108-
set tscache1 "#%Module$major_minor_rel"
108+
set tscache1 "#%Module$cache_mcookie_version"
109109
foreach f [lsort [concat [array names file_arr] [list foo quux/oth empty anotherempty]]] {
110110
set entry {}
111111
switch -glob -- $f {
@@ -157,7 +157,7 @@ change_file_perms $mp1/.version $no_ar_perms
157157
change_file_perms $mp1/foo/1.0 $no_ar_perms
158158
change_file_perms $mp1/foo/.modulerc $no_arx_perms
159159

160-
set tscache2 "#%Module$major_minor_rel"
160+
set tscache2 "#%Module$cache_mcookie_version"
161161
foreach f [lsort [concat [array names file_arr] [list quux empty anotherempty]]] {
162162
set entry {}
163163
switch -glob -- $f {
@@ -297,7 +297,7 @@ change_file_perms $mp1/quxc/1.0~ $no_arx_perms
297297
change_file_perms $mp1/.svn $no_arx_perms
298298
change_file_perms $mp1/.sos/ignmod $no_arx_perms
299299

300-
set tscachewin1 "#%Module$major_minor_rel"
300+
set tscachewin1 "#%Module$cache_mcookie_version"
301301
foreach f [lsort [concat [array names file_arr] [list foo empty anotherempty]]] {
302302
set entry {}
303303
switch -glob -- $f {
@@ -363,7 +363,7 @@ change_file_perms $mp1/quxc/1.0~ $no_orx_perms
363363
change_file_perms $mp1/.svn $no_orx_perms
364364
change_file_perms $mp1/.sos/ignmod $no_orx_perms
365365

366-
set tscachewin2 "#%Module$major_minor_rel"
366+
set tscachewin2 "#%Module$cache_mcookie_version"
367367
foreach f [lsort [array names file_arr]] {
368368
set entry {}
369369
switch -- $f {

‎testsuite/modules.30-cache/040-cache-use.exp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ file delete $mp1cache
147147

148148
# tests with a cache containing only few elements
149149
set fid [open $mp1cache w]
150-
puts $fid "#%Module$::major_minor_rel
150+
puts $fid "#%Module$::cache_mcookie_version
151151
modulefile-content bar/1.0 1664035017 #%Module #%Module"
152152
close $fid
153153
testouterr_cmd sh {avail -a -t -o } OK bar/1.0
@@ -228,7 +228,7 @@ file delete $mp1cache
228228

229229
# tests with a cache containing element that does not exists anymore in modulepath
230230
set fid [open $mp1cache w]
231-
puts $fid "#%Module$::major_minor_rel
231+
puts $fid "#%Module$::cache_mcookie_version
232232
modulefile-content bar/5.0 1664035017 #%Module #%Module"
233233
close $fid
234234
testouterr_cmd sh {avail -a -t -o } OK bar/5.0

‎testsuite/modules.30-cache/041-cache-interp.exp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ array set other_file_arr $other_file_list
3333

3434
# create cache file for mp1 that supersedes command definition
3535
set fid [open $mp1cache w]
36-
puts $fid "#%Module$major_minor_rel
36+
puts $fid "#%Module$cache_mcookie_version
3737
modulefile-content foo/1.0 {} {#%Module} {#%Module}
3838
modulerc-content foo/.modulerc {#%Module} {#%Module}
3939
proc modulefile-content {args} {}
@@ -57,12 +57,12 @@ testouterr_cmd sh {avail -t} OK $tserr
5757

5858
# test local variables and procedures are not propagated to the next evaluation
5959
set fid [open $mp1cache w]
60-
puts $fid "#%Module$major_minor_rel
60+
puts $fid "#%Module$cache_mcookie_version
6161
proc foo {args} {}
6262
set bar val"
6363
close $fid
6464
set fid [open $mp2cache w]
65-
puts $fid "#%Module$major_minor_rel
65+
puts $fid "#%Module$cache_mcookie_version
6666
if {\[llength \[info procs foo\]\]} {
6767
modulefile-content foo/1.0 {} {#%Module} {#%Module}
6868
}
@@ -77,7 +77,7 @@ testouterr_cmd sh {avail -t} OK {}
7777

7878
# test a cachefile overriding basic Tcl command
7979
set fid [open $mp1cache w]
80-
puts $fid "#%Module$major_minor_rel
80+
puts $fid "#%Module$cache_mcookie_version
8181
proc set {args} {}"
8282
close $fid
8383
set tserr [msg_create $mp2cache]

‎testsuite/modules.30-cache/042-cache-error.exp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ setenv_var MODULEPATH $mp1
3939

4040
# cache with an unknown command
4141
set fid [open $mp1cache w]
42-
puts $fid "#%Module$major_minor_rel
42+
puts $fid "#%Module$cache_mcookie_version
4343
modulefile-content foo/1.0 1000000000 #%Module {#%Module
4444
module-whatis foo/1.0
4545
setenv FOO 1}
@@ -83,7 +83,7 @@ testouterr_cmd sh {load bar/2.0} $ans_load2 $cacheerr
8383

8484
# cache with a command with bad args
8585
set fid [open $mp1cache w]
86-
puts $fid "#%Module$major_minor_rel
86+
puts $fid "#%Module$cache_mcookie_version
8787
modulefile-content foo/1.0 1000000000 #%Module {#%Module
8888
module-whatis foo/1.0
8989
setenv FOO 1}
@@ -109,7 +109,7 @@ testouterr_cmd sh {load bar/2.0} $ans_load2 $cacheerr
109109

110110
# cache with unbalanced curly brace
111111
set fid [open $mp1cache w]
112-
puts $fid "#%Module$major_minor_rel
112+
puts $fid "#%Module$cache_mcookie_version
113113
modulefile-content foo/1.0 1000000000 #%Module {#%Module
114114
module-whatis foo/1.0
115115
setenv FOO 1}
@@ -135,7 +135,7 @@ testouterr_cmd_re sh {load bar/2.0} $ans_load2 $cacheerr
135135

136136
# cache with unbalanced quote
137137
set fid [open $mp1cache w]
138-
puts $fid "#%Module$major_minor_rel
138+
puts $fid "#%Module$cache_mcookie_version
139139
modulefile-content foo/1.0 1000000000 #%Module {#%Module
140140
module-whatis foo/1.0
141141
setenv FOO 1}
@@ -162,7 +162,7 @@ testouterr_cmd_re sh {load bar/2.0} $ans_load2 $cacheerr
162162

163163
# duplicate modulefile and modulerc entries
164164
set fid [open $mp1cache w]
165-
puts $fid "#%Module$major_minor_rel
165+
puts $fid "#%Module$cache_mcookie_version
166166
modulefile-content foo/1.0 1000000000 #%Module {#%Module
167167
module-whatis foo/1.0
168168
setenv FOO 1}

0 commit comments

Comments
 (0)