@@ -8,12 +8,12 @@ import runtime
8
8
import benchmark
9
9
10
10
const skip_files = [
11
- 'non_existing.vv' /* minimize commit diff churn, do not remove */ ,
12
- ]
11
+ 'non_existing.vv' /* minimize commit diff churn, do not remove */ ,
12
+ ]
13
13
14
14
const skip_on_ubuntu_musl = [
15
- 'vlib/v/checker/tests/vweb_tmpl_used_var.vv' ,
16
- ]
15
+ 'vlib/v/checker/tests/vweb_tmpl_used_var.vv' ,
16
+ ]
17
17
18
18
const turn_off_vcolors = os.setenv ('VCOLORS' , 'never' , true )
19
19
@@ -117,14 +117,22 @@ fn test_all() {
117
117
parallel_jobs: 1
118
118
label: 'comptime define tests'
119
119
}
120
- ct_tasks.add_checked_run ('-d mysymbol run' , '.mysymbol.run.out' , ['custom_comptime_define_error.vv' ])
121
- ct_tasks.add_checked_run ('-d mydebug run' , '.mydebug.run.out' , ['custom_comptime_define_if_flag.vv' ])
122
- ct_tasks.add_checked_run ('-d nodebug run' , '.nodebug.run.out' , ['custom_comptime_define_if_flag.vv' ])
120
+ ct_tasks.add_checked_run ('-d mysymbol run' , '.mysymbol.run.out' , [
121
+ 'custom_comptime_define_error.vv' ,
122
+ ])
123
+ ct_tasks.add_checked_run ('-d mydebug run' , '.mydebug.run.out' , [
124
+ 'custom_comptime_define_if_flag.vv' ,
125
+ ])
126
+ ct_tasks.add_checked_run ('-d nodebug run' , '.nodebug.run.out' , [
127
+ 'custom_comptime_define_if_flag.vv' ,
128
+ ])
123
129
ct_tasks.add_checked_run ('run' , '.run.out' , ['custom_comptime_define_if_debug.vv' ])
124
130
ct_tasks.add_checked_run ('-g run' , '.g.run.out' , ['custom_comptime_define_if_debug.vv' ])
125
131
ct_tasks.add_checked_run ('-cg run' , '.cg.run.out' , ['custom_comptime_define_if_debug.vv' ])
126
132
ct_tasks.add_checked_run ('-d debug run' , '.debug.run.out' , ['custom_comptime_define_if_debug.vv' ])
127
- ct_tasks.add_checked_run ('-d debug -d bar run' , '.debug.bar.run.out' , ['custom_comptime_define_if_debug.vv' ])
133
+ ct_tasks.add_checked_run ('-d debug -d bar run' , '.debug.bar.run.out' , [
134
+ 'custom_comptime_define_if_debug.vv' ,
135
+ ])
128
136
ct_tasks.run ()
129
137
}
130
138
@@ -179,10 +187,10 @@ fn (mut tasks Tasks) run() {
179
187
}
180
188
$if msvc {
181
189
m_skip_files << 'vlib/v/checker/tests/asm_alias_does_not_exist.vv'
182
- m_skip_files << 'vlib/v/checker/tests/asm_immutable_err.vv'
190
+ m_skip_files << 'vlib/v/checker/tests/asm_immutable_err.vv'
183
191
// TODO: investigate why MSVC regressed
184
192
m_skip_files << 'vlib/v/checker/tests/missing_c_lib_header_1.vv'
185
- m_skip_files << 'vlib/v/checker/tests/missing_c_lib_header_with_explanation_2.vv'
193
+ m_skip_files << 'vlib/v/checker/tests/missing_c_lib_header_with_explanation_2.vv'
186
194
}
187
195
for i in 0 .. tasks.all.len {
188
196
if tasks.all[i].path in m_skip_files {
@@ -194,6 +202,10 @@ fn (mut tasks Tasks) run() {
194
202
for _ in 0 .. vjobs {
195
203
go work_processor (mut work, mut results)
196
204
}
205
+ if github_job == '' {
206
+ println ('' )
207
+ }
208
+ mut line_can_be_erased := true
197
209
mut total_errors := 0
198
210
for _ in 0 .. tasks.all.len {
199
211
mut task := TaskDescription{}
@@ -202,6 +214,7 @@ fn (mut tasks Tasks) run() {
202
214
if task.is_skipped {
203
215
bench.skip ()
204
216
eprintln (bstep_message (mut bench, benchmark.b_skip, task.path, task.took))
217
+ line_can_be_erased = false
205
218
continue
206
219
}
207
220
if task.is_error {
@@ -219,14 +232,22 @@ fn (mut tasks Tasks) run() {
219
232
println (task.found___)
220
233
println ('============\n ' )
221
234
diff_content (task.expected, task.found___)
235
+ line_can_be_erased = false
222
236
} else {
223
237
bench.ok ()
224
238
if tasks.show_cmd {
225
239
eprintln (bstep_message (mut bench, benchmark.b_ok, '$task.cli_cmd $task.path ' ,
226
240
task.took))
227
241
} else {
228
- eprintln (bstep_message (mut bench, benchmark.b_ok, task.path, task.took))
242
+ if github_job == '' {
243
+ // local mode:
244
+ if line_can_be_erased {
245
+ term.clear_previous_line ()
246
+ }
247
+ println (bstep_message (mut bench, benchmark.b_ok, task.path, task.took))
248
+ }
229
249
}
250
+ line_can_be_erased = true
230
251
}
231
252
}
232
253
bench.stop ()
0 commit comments