compiler: extract testing to tools/vtest.v
parent
a691cc857e
commit
bfe039fcba
|
@ -1,4 +1,4 @@
|
||||||
module compiler
|
module main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
os
|
os
|
||||||
|
@ -22,7 +22,15 @@ pub fn new_test_sesion(vargs string) TestSession {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn test_v() {
|
fn vexe_path() string {
|
||||||
|
// NB: tools extracted from v require that the first
|
||||||
|
// argument to them to be the v executable location.
|
||||||
|
// They are usually launched by vlib/compiler/vtools.v,
|
||||||
|
// launch_tool/1 , which provides it.
|
||||||
|
return os.args[1]
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn main() {
|
||||||
args := os.args
|
args := os.args
|
||||||
if args.last() == 'test' {
|
if args.last() == 'test' {
|
||||||
println('Usage:')
|
println('Usage:')
|
2
v.v
2
v.v
|
@ -58,7 +58,7 @@ fn main() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
else if 'test' in commands {
|
else if 'test' in commands {
|
||||||
compiler.test_v()
|
compiler.launch_tool('vtest')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Generate the docs and exit
|
// Generate the docs and exit
|
||||||
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
module compiler
|
||||||
|
|
||||||
|
import os
|
||||||
|
|
||||||
|
pub fn launch_tool(tname string){
|
||||||
|
vexe := vexe_path()
|
||||||
|
vroot := os.dir(vexe)
|
||||||
|
mut oargs := os.args
|
||||||
|
oargs[0] = vexe // make it more explicit
|
||||||
|
tool_exe := os.realpath('$vroot/tools/$tname')
|
||||||
|
tool_source := os.realpath('$vroot/tools/${tname}.v')
|
||||||
|
//////////////////////////////////////////////////////
|
||||||
|
tool_args := oargs.join(' ')
|
||||||
|
tool_command := '$tool_exe $tool_args'
|
||||||
|
//println('Launching: "$tool_command" ...')
|
||||||
|
|
||||||
|
mut tool_should_be_recompiled := false
|
||||||
|
if !os.file_exists( tool_exe ) {
|
||||||
|
// fresh checkout
|
||||||
|
tool_should_be_recompiled = true
|
||||||
|
}else{
|
||||||
|
if os.file_last_mod_unix( tool_exe ) <= os.file_last_mod_unix( vexe ) {
|
||||||
|
// v was recompiled, maybe after v up ...
|
||||||
|
// rebuild the tool too just in case
|
||||||
|
tool_should_be_recompiled = true
|
||||||
|
}
|
||||||
|
if os.file_last_mod_unix( tool_exe ) <= os.file_last_mod_unix( tool_source ) {
|
||||||
|
// the user changed the source code of the tool
|
||||||
|
tool_should_be_recompiled = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if tool_should_be_recompiled {
|
||||||
|
compilation_command := '$vexe -prod $tool_source'
|
||||||
|
//println('Compiling $tname with: "$compilation_command"')
|
||||||
|
tool_compilation := os.exec(compilation_command) or { panic(err) }
|
||||||
|
if tool_compilation.exit_code != 0 {
|
||||||
|
panic('V tool "$tool_source" could not be compiled.')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
exit( os.system(tool_command) )
|
||||||
|
}
|
Loading…
Reference in New Issue