mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-13 22:42:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

testing: add temporary file hash to prevent accidental collisions with test file binaries (#19710)

Browse source
This commit is contained in:
Turiiya 2023-10-31 07:07:51 +01:00 • committed by GitHub
parent 1c4c5050de
commit a2dabddc70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cmd/tools/modules/testing/common.v
View file

@ -61,6 +61,7 @@ pub mut:
nmessage_idx int // currently printed message index nmessage_idx int // currently printed message index
failed_cmds shared []string failed_cmds shared []string
reporter Reporter = Reporter(NormalReporter{}) reporter Reporter = Reporter(NormalReporter{})
hash string // used during testing in temporary directory and file names to prevent collisions when files and directories are created in a test file.
} }
pub fn (mut ts TestSession) add_failed_cmd(cmd string) { pub fn (mut ts TestSession) add_failed_cmd(cmd string) {
@ -274,7 +275,8 @@ pub fn new_test_session(_vargs string, will_compile bool) TestSession {
vargs := _vargs.replace('-progress', '') vargs := _vargs.replace('-progress', '')
vexe := pref.vexe_path() vexe := pref.vexe_path()
vroot := os.dir(vexe) vroot := os.dir(vexe)
new_vtmp_dir := setup_new_vtmp_folder() hash := '${sync.thread_id().hex()}_${time.sys_mono_now()}'
new_vtmp_dir := setup_new_vtmp_folder(hash)
if term.can_show_color_on_stderr() { if term.can_show_color_on_stderr() {
os.setenv('VCOLORS', 'always', true) os.setenv('VCOLORS', 'always', true)
} }
@ -286,6 +288,7 @@ pub fn new_test_session(_vargs string, will_compile bool) TestSession {
show_stats: '-stats' in vargs.split(' ') show_stats: '-stats' in vargs.split(' ')
vargs: vargs vargs: vargs
vtmp_dir: new_vtmp_dir vtmp_dir: new_vtmp_dir
hash: hash
silent_mode: _vargs.contains('-silent') silent_mode: _vargs.contains('-silent')
progress_mode: _vargs.contains('-progress') progress_mode: _vargs.contains('-progress')
} }
@ -400,7 +403,6 @@ fn worker_trunner(mut p pool.PoolProcessor, idx int, thread_id int) voidptr {
return pool.no_result return pool.no_result
} }
} }
tmpd := ts.vtmp_dir
// tls_bench is used to format the step messages/timings // tls_bench is used to format the step messages/timings
mut tls_bench := unsafe { &benchmark.Benchmark(p.get_thread_context(idx)) } mut tls_bench := unsafe { &benchmark.Benchmark(p.get_thread_context(idx)) }
if isnil(tls_bench) { if isnil(tls_bench) {
@ -441,13 +443,11 @@ fn worker_trunner(mut p pool.PoolProcessor, idx int, thread_id int) voidptr {
// Remove them after a test passes/fails. // Remove them after a test passes/fails.
fname := os.file_name(file) fname := os.file_name(file)
generated_binary_fname := if os.user_os() == 'windows' && !run_js { generated_binary_fname := if os.user_os() == 'windows' && !run_js {
fname.replace('.v', '.exe') '${fname.all_before_last('.v')}_${ts.hash}.exe'
} else if !run_js {
fname.replace('.v', '')
} else { } else {
fname.replace('.v', '') '${fname.all_before_last('.v')}_${ts.hash}'
} }
generated_binary_fpath := os.join_path_single(tmpd, generated_binary_fname) generated_binary_fpath := os.join_path_single(ts.vtmp_dir, generated_binary_fname)
if produces_file_output { if produces_file_output {
if ts.rm_binaries { if ts.rm_binaries {
os.rm(generated_binary_fpath) or {} os.rm(generated_binary_fpath) or {}
@ -455,7 +455,7 @@ fn worker_trunner(mut p pool.PoolProcessor, idx int, thread_id int) voidptr {
cmd_options << ' -o ${os.quoted_path(generated_binary_fpath)}' cmd_options << ' -o ${os.quoted_path(generated_binary_fpath)}'
} }
cmd := '${os.quoted_path(ts.vexe)} ' + cmd_options.join(' ') + ' ${os.quoted_path(file)}' cmd := '${os.quoted_path(ts.vexe)} ${cmd_options.join(' ')} ${os.quoted_path(file)}'
ts.benchmark.step() ts.benchmark.step()
tls_bench.step() tls_bench.step()
if relative_file.replace('\\', '/') in ts.skip_files { if relative_file.replace('\\', '/') in ts.skip_files {
@ -712,9 +712,8 @@ pub fn building_any_v_binaries_failed() bool {
// setup_new_vtmp_folder creates a new nested folder inside VTMP, then resets VTMP to it, // setup_new_vtmp_folder creates a new nested folder inside VTMP, then resets VTMP to it,
// so that V programs/tests will write their temporary files to new location. // so that V programs/tests will write their temporary files to new location.
// The new nested folder, and its contents, will get removed after all tests/programs succeed. // The new nested folder, and its contents, will get removed after all tests/programs succeed.
pub fn setup_new_vtmp_folder() string { pub fn setup_new_vtmp_folder(hash string) string {
now := time.sys_mono_now() new_vtmp_dir := os.join_path(os.vtmp_dir(), 'tsession_${hash}')
new_vtmp_dir := os.join_path(os.vtmp_dir(), 'tsession_${sync.thread_id().hex()}_${now}')
os.mkdir_all(new_vtmp_dir) or { panic(err) } os.mkdir_all(new_vtmp_dir) or { panic(err) }
os.setenv('VTMP', new_vtmp_dir, true) os.setenv('VTMP', new_vtmp_dir, true)
return new_vtmp_dir return new_vtmp_dir

2
cmd/tools/vcreate/vcreate_input_test.v
View file

@ -11,8 +11,6 @@ const (
expect_tests_path = os.join_path(@VMODROOT, 'cmd', 'tools', 'vcreate', 'tests') expect_tests_path = os.join_path(@VMODROOT, 'cmd', 'tools', 'vcreate', 'tests')
// Running tests appends a tsession path to VTMP, which is automatically cleaned up after the test. // Running tests appends a tsession path to VTMP, which is automatically cleaned up after the test.
// The following will result in e.g. `$VTMP/tsession_7fe8e93bd740_1612958707536/test_vcreate_input/`. // The following will result in e.g. `$VTMP/tsession_7fe8e93bd740_1612958707536/test_vcreate_input/`.
// Note: The following uses `test_vcreate_input` deliberately and NOT `vcreate_input_test`.
// This avoids clashes with the `_test` postfix, which V also uses for test file binaries.
test_module_path = os.join_path(os.vtmp_dir(), 'test_vcreate_input') test_module_path = os.join_path(os.vtmp_dir(), 'test_vcreate_input')
) )

2
cmd/tools/vcreate/vcreate_test.v
View file

@ -4,8 +4,6 @@ const (
test_project_dir_name = 'test_project' test_project_dir_name = 'test_project'
// Running tests appends a tsession path to VTMP, which is automatically cleaned up after the test. // Running tests appends a tsession path to VTMP, which is automatically cleaned up after the test.
// The following will result in e.g. `$VTMP/tsession_7fe8e93bd740_1612958707536/test_project/`. // The following will result in e.g. `$VTMP/tsession_7fe8e93bd740_1612958707536/test_project/`.
// Note: The following uses `test_vcreate` deliberately and NOT `vcreate_test`.
// This avoids clashes with the `_test` postfix, which V also uses for test file binaries.
test_path = os.join_path(os.vtmp_dir(), test_project_dir_name) test_path = os.join_path(os.vtmp_dir(), test_project_dir_name)
) )