vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

vfmt: correctly increment error counter (#7615)

pull/7650/head
Lukas Neubert 2020-12-27 15:26:51 +01:00 committed by GitHub
parent 5c4c5042b3
commit aac8520838
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/tools/vfmt.v
View File

@ -123,6 +123,7 @@ fn main() {
errors++ errors++
continue continue
} }
// Guard against a possibly crashing worker process.
if worker_result.exit_code != 0 { if worker_result.exit_code != 0 {
eprintln(worker_result.output) eprintln(worker_result.output)
if worker_result.exit_code == 1 { if worker_result.exit_code == 1 {
@ -137,7 +138,9 @@ fn main() {
formatted_warn_errs := wresult[0] formatted_warn_errs := wresult[0]
formatted_file_path := wresult[1].trim_right('\n\r') formatted_file_path := wresult[1].trim_right('\n\r')
foptions.is_worker = true foptions.is_worker = true
foptions.post_process_file(fpath, formatted_file_path) foptions.post_process_file(fpath, formatted_file_path) or {
errors = errors + 1
}
foptions.is_worker = false foptions.is_worker = false
if formatted_warn_errs.len > 0 { if formatted_warn_errs.len > 0 {
eprintln(formatted_warn_errs) eprintln(formatted_warn_errs)
@ -152,7 +155,12 @@ fn main() {
if foptions.is_noerror { if foptions.is_noerror {
exit(0) exit(0)
} }
exit(1) if foptions.is_verify {
exit(1)
}
if foptions.is_c {
exit(2)
}
} }
} }
@ -192,7 +200,7 @@ fn print_compiler_options(compiler_params &pref.Preferences) {
eprintln(' is_script: $compiler_params.is_script ') eprintln(' is_script: $compiler_params.is_script ')
} }
fn (foptions &FormatOptions) post_process_file(file string, formatted_file_path string) { fn (foptions &FormatOptions) post_process_file(file string, formatted_file_path string) ? {
if formatted_file_path.len == 0 { if formatted_file_path.len == 0 {
return return
} }
@ -215,9 +223,7 @@ fn (foptions &FormatOptions) post_process_file(file string, formatted_file_path
x := util.color_compare_files(diff_cmd, file, formatted_file_path) x := util.color_compare_files(diff_cmd, file, formatted_file_path)
if x.len != 0 { if x.len != 0 {
println("$file is not vfmt'ed") println("$file is not vfmt'ed")
if !foptions.is_worker { return error('')
exit(1)
}
} }
return return
} }
@ -233,9 +239,7 @@ fn (foptions &FormatOptions) post_process_file(file string, formatted_file_path
if foptions.is_c { if foptions.is_c {
if is_formatted_different { if is_formatted_different {
eprintln('File is not formatted: $file') eprintln('File is not formatted: $file')
if !foptions.is_worker { return error('')
exit(2)
}
} }
return return
} }