mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-14 15:02:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

testing: fix reliance on os.join_path with , to produce a folder ending with / or \ (#19913)

Browse source
This commit is contained in:
Delyan Angelov 2023-11-17 17:29:15 +02:00 • committed by GitHub
parent 76530de56d
commit 157d603e5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -627,6 +627,7 @@ pub fn vlib_should_be_present(parent_dir string) {
pub fn prepare_test_session(zargs string, folder string, oskipped []string, main_label string) TestSession { pub fn prepare_test_session(zargs string, folder string, oskipped []string, main_label string) TestSession {
vexe := pref.vexe_path() vexe := pref.vexe_path()
parent_dir := os.dir(vexe) parent_dir := os.dir(vexe)
nparent_dir := parent_dir.replace('\\', '/')
vlib_should_be_present(parent_dir) vlib_should_be_present(parent_dir)
vargs := zargs.replace(vexe, '') vargs := zargs.replace(vexe, '')
eheader(main_label) eheader(main_label)
@ -653,11 +654,10 @@ pub fn prepare_test_session(zargs string, folder string, oskipped []string, main
continue continue
} }
} }
c := os.read_file(f) or { panic(err) } c := os.read_file(fnormalised) or { panic(err) }
start := c#[0..testing.header_bytes_to_search_for_module_main] start := c#[0..testing.header_bytes_to_search_for_module_main]
if start.contains('module ') && !start.contains('module main') { if start.contains('module ') && !start.contains('module main') {
skipped_f := f.replace(os.join_path_single(parent_dir, ''), '') skipped << fnormalised.replace(nparent_dir + '/', '')
skipped << skipped_f
} }
for skip_prefix in oskipped { for skip_prefix in oskipped {
skip_folder := skip_prefix + '/' skip_folder := skip_prefix + '/'
@ -665,7 +665,7 @@ pub fn prepare_test_session(zargs string, folder string, oskipped []string, main
continue next_file continue next_file
} }
} }
mains << f mains << fnormalised
} }
session.files << mains session.files << mains
session.skip_files << skipped session.skip_files << skipped