Skip to content

Commit f4209b4

Browse files
committed
ts: fix incorrect exec of proc output in catch block
Signed-off-by: Xavier Delaruelle <xavier.delaruelle@cea.fr>
1 parent 53eb83e commit f4209b4

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

testsuite/example/siteconfig.tcl-1

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,29 +131,29 @@ if {[info exists env(TESTSUITE_ENABLE_SITECONFIG_TCLEXTLIBBADCALL)]} {
131131
set badcalllist [list readFile {readFile foo bar} {readFile foo 0 bar}\
132132
{readFile foo 0 0 0} getFilesInDirectory {getFilesInDirectory foo bar}]
133133
foreach badcall $badcalllist {
134-
if {[catch {[eval $badcall]} errMsg]} {
134+
if {[catch {eval $badcall} errMsg]} {
135135
reportError $errMsg
136136
}
137137
}
138138
}
139139

140140
# test tcl ext lib procedures against a failed closedir call
141141
if {[info exists env(TESTSUITE_ENABLE_SITECONFIG_TCLEXTLIBFAILEDCLOSEDIR)]} {
142-
if {[catch {[getFilesInDirectory $env(TESTSUITEDIR)/modulefiles 0]} errMsg]} {
142+
if {[catch {getFilesInDirectory $env(TESTSUITEDIR)/modulefiles 0} errMsg]} {
143143
reportError $errMsg
144144
}
145145
}
146146

147147
# test tcl ext lib procedures against a failed getpwduid call
148148
if {[info exists env(TESTSUITE_ENABLE_SITECONFIG_TCLEXTLIBFAILEDGETPWUID)]} {
149-
if {[catch {[initStateUsername]} errMsg]} {
149+
if {[catch {initStateUsername} errMsg]} {
150150
reportError $errMsg
151151
}
152152
}
153153

154154
# test tcl ext lib procedures against a failed getgroups call
155155
if {[info exists env(TESTSUITE_ENABLE_SITECONFIG_TCLEXTLIBFAILEDGETGROUPS)]} {
156-
if {[catch {[initStateUsergroups]} errMsg]} {
156+
if {[catch {initStateUsergroups} errMsg]} {
157157
reportError $errMsg
158158
}
159159
}
@@ -170,28 +170,28 @@ if {[info exists env(TESTSUITE_ENABLE_SITECONFIG_TCLEXTLIBDUPGETGROUPS)]} {
170170

171171
# test tcl ext lib procedures against a failed time call
172172
if {[info exists env(TESTSUITE_ENABLE_SITECONFIG_TCLEXTLIBFAILEDTIME)]} {
173-
if {[catch {[initStateClockSeconds]} errMsg]} {
173+
if {[catch {initStateClockSeconds} errMsg]} {
174174
reportError $errMsg
175175
}
176176
}
177177

178178
# test tcl ext lib procedures called without argument
179179
if {[info exists env(TESTSUITE_ENABLE_SITECONFIG_PARSEDATETIMEARG_NOARG)]} {
180-
if {[catch {[parseDateTimeArg]} errMsg]} {
180+
if {[catch {parseDateTimeArg} errMsg]} {
181181
reportError $errMsg
182182
}
183183
}
184184

185185
# test tcl ext lib procedures against a failed mktime call
186186
if {[info exists env(TESTSUITE_ENABLE_SITECONFIG_TCLEXTLIBFAILEDMKTIME)]} {
187-
if {[catch {[parseDateTimeArg --before 2020-09-18]} errMsg]} {
187+
if {[catch {parseDateTimeArg --before 2020-09-18} errMsg]} {
188188
reportError $errMsg
189189
}
190190
}
191191

192192
# test tcl ext lib procedures called with badly formatted date
193193
if {[info exists env(TESTSUITE_ENABLE_SITECONFIG_PARSEDATETIMEARG_BADDATE)]} {
194-
if {[catch {[parseDateTimeArg --before 2020-09-19U20:00]} errMsg]} {
194+
if {[catch {parseDateTimeArg --before 2020-09-19U20:00} errMsg]} {
195195
reportError $errMsg
196196
}
197197
}

0 commit comments

Comments
 (0)