Skip to content

Commit 127c4d2

Browse files
committed
ts: remove unused no_verbose var and modulecmd_start proc
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent e65d789 commit 127c4d2

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

testsuite/config/unix.exp

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ proc default_tclsh {} {
9595

9696

9797
#
98-
# modulecmd_start -- start modulecmd running
99-
# Since modulecmd writes to both streams, stdout and stderr, a catcher
100-
# has to be installed in order to scan both
98+
# modulecmd_xxx_ -- run modulecmd
10199
#
102100

103101
# alternative method to collect stdout and stderr from command execution (on
@@ -134,7 +132,6 @@ proc modulecmd_xxx_ {command {input noinput}} {
134132
global comp_error
135133
global comp_exit
136134
global errorCode
137-
global no_verbose
138135

139136
if {[info exists ::endpipe]} {
140137
unset ::endpipe
@@ -162,7 +159,7 @@ proc modulecmd_xxx_ {command {input noinput}} {
162159
lappend cmdlist << $input
163160
}
164161

165-
if { ! $no_verbose && $verbose > 1 } {
162+
if { $verbose > 1 } {
166163
send_user "starting [lrange $cmdlist 1 end]\n"
167164
}
168165

@@ -195,7 +192,6 @@ proc modulecmd_xxx_ {command {input noinput}} {
195192
global comp_error
196193
global comp_exit
197194
global errorCode
198-
global no_verbose
199195

200196
if ![info exists command] then {
201197
unresolved "internal testsuite error: no module command specified"
@@ -220,7 +216,7 @@ proc modulecmd_xxx_ {command {input noinput}} {
220216
lappend cmdlist << $input
221217
}
222218

223-
if { ! $no_verbose && $verbose > 1 } {
219+
if { $verbose > 1 } {
224220
send_user "starting [lrange $cmdlist 1 end]\n"
225221
}
226222

@@ -249,14 +245,6 @@ proc modulecmd_xxx_ {command {input noinput}} {
249245

250246
}
251247

252-
proc modulecmd_start {command {input noinput}} {
253-
global no_verbose
254-
255-
set no_verbose 0
256-
modulecmd_xxx_ "$command" $input
257-
unset no_verbose
258-
}
259-
260248

261249
#
262250
# Test procedure to check a module installation

testsuite/modules.00-init/006-procs.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ proc _test_sub {test_shell cmd {input noinput}} {
4747
}
4848

4949
set shell $test_shell
50-
modulecmd_start "$cmd" $input
50+
modulecmd_xxx_ "$cmd" $input
5151

5252
if { $verbose > 1 } {
5353
set ol [string length $comp_output]

0 commit comments

Comments
 (0)