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

tests: update assert output

pull/4220/head
Alexey 2020-04-03 14:39:11 +03:00 committed by GitHub
parent 6c4de001b8
commit 6a5cc0fa19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/tools/modules/testing/common.v
View File

@ -156,7 +156,7 @@ fn worker_trunner(p mut sync.PoolProcessor, idx int, thread_id int) voidptr {
ts.failed = true ts.failed = true
ts.benchmark.fail() ts.benchmark.fail()
tls_bench.fail() tls_bench.fail()
eprintln(tls_bench.step_message_fail('${relative_file}\n`$file`\n (\n$r.output\n)')) eprintln(tls_bench.step_message_fail('${relative_file}\n$r.output\n'))
} }
else { else {
ts.benchmark.ok() ts.benchmark.ok()

6
cmd/tools/preludes/tests_assertions.v
View File

@ -21,11 +21,7 @@ fn cb_assertion_failed(filename string, line int, sourceline string, funcname st
} }
final_filename := if use_relative_paths { filename } else { os.real_path(filename) } final_filename := if use_relative_paths { filename } else { os.real_path(filename) }
final_funcname := funcname.replace('main__', '').replace('__', '.') final_funcname := funcname.replace('main__', '').replace('__', '.')
mut fail_message := 'FAILED assertion' eprintln('File : $final_filename:$line')
if color_on {
fail_message = term.bold(term.red(fail_message))
}
eprintln('$final_filename:$line: $fail_message')
eprintln('Function: $final_funcname') eprintln('Function: $final_funcname')
eprintln('Source : $sourceline') eprintln('Source : $sourceline')
} }

12
vlib/v/gen/cgen.v
View File

@ -557,16 +557,20 @@ fn (g mut Gen) gen_assert_stmt(a ast.AssertStmt) {
g.writeln('// assert') g.writeln('// assert')
g.write('if( ') g.write('if( ')
g.expr(a.expr) g.expr(a.expr)
s_assertion := a.expr.str().replace('"', "\'")
g.write(' )') g.write(' )')
s_assertion := a.expr.str().replace('"', "\'")
mut mod_path := g.file.path
$if windows {
mod_path = g.file.path.replace('\\', '\\\\')
}
if g.is_test { if g.is_test {
g.writeln('{') g.writeln('{')
g.writeln(' g_test_oks++;') g.writeln(' g_test_oks++;')
g.writeln(' cb_assertion_ok( _STR("${g.file.path}"), ${a.pos.line_nr}, _STR("assert ${s_assertion}"), _STR("${g.fn_decl.name}()") );') g.writeln(' cb_assertion_ok( _STR("${mod_path}"), ${a.pos.line_nr}, _STR("assert ${s_assertion}"), _STR("${g.fn_decl.name}()") );')
// g.writeln(' println(_STR("OK ${g.file.path}:${a.pos.line_nr}: fn ${g.fn_decl.name}(): assert $s_assertion"));') // g.writeln(' println(_STR("OK ${g.file.path}:${a.pos.line_nr}: fn ${g.fn_decl.name}(): assert $s_assertion"));')
g.writeln('}else{') g.writeln('}else{')
g.writeln(' g_test_fails++;') g.writeln(' g_test_fails++;')
g.writeln(' cb_assertion_failed( _STR("${g.file.path}"), ${a.pos.line_nr}, _STR("assert ${s_assertion}"), _STR("${g.fn_decl.name}()") );') g.writeln(' cb_assertion_failed( _STR("${mod_path}"), ${a.pos.line_nr}, _STR("assert ${s_assertion}"), _STR("${g.fn_decl.name}()") );')
g.writeln(' exit(1);') g.writeln(' exit(1);')
g.writeln(' // TODO') g.writeln(' // TODO')
g.writeln(' // Maybe print all vars in a test function if it fails?') g.writeln(' // Maybe print all vars in a test function if it fails?')
@ -574,7 +578,7 @@ fn (g mut Gen) gen_assert_stmt(a ast.AssertStmt) {
return return
} }
g.writeln('{}else{') g.writeln('{}else{')
g.writeln(' eprintln(_STR("${g.file.path}:${a.pos.line_nr}: FAIL: fn ${g.fn_decl.name}(): assert $s_assertion"));') g.writeln(' println(_STR("${mod_path}:${a.pos.line_nr}: FAIL: fn ${g.fn_decl.name}(): assert $s_assertion"));')
g.writeln(' exit(1);') g.writeln(' exit(1);')
g.writeln('}') g.writeln('}')
} }