ci: fix v test-cleancode

vlib/os/inode_test.v

@@ -8,18 +8,18 @@ const (
 )
 
 fn testsuite_begin() {
-	eprintln('testsuite_begin, tfolder = $tfolder')
-	os.rmdir_all(tfolder)
-	assert !os.is_dir(tfolder)
-	os.mkdir_all(tfolder)
-	os.chdir(tfolder)
-	assert os.is_dir(tfolder)
+	eprintln('testsuite_begin, tfolder = $main.tfolder')
+	os.rmdir_all(main.tfolder)
+	assert !os.is_dir(main.tfolder)
+	os.mkdir_all(main.tfolder)
+	os.chdir(main.tfolder)
+	assert os.is_dir(main.tfolder)
 }
 
 fn testsuite_end() {
 	os.chdir(os.wd_at_startup)
-	os.rmdir_all(tfolder)
-	assert !os.is_dir(tfolder)
+	os.rmdir_all(main.tfolder)
+	assert !os.is_dir(main.tfolder)
 }
 
 fn test_inode_file_type() {

vlib/os/os.v

@@ -330,11 +330,11 @@ pub fn write_file_array(path string, buffer array) ? {
 // It relies on path manipulation of os.args[0] and os.wd_at_startup, so it may not work properly in
 // all cases, but it should be better, than just using os.args[0] directly.
 fn executable_fallback() string {
-	if args.len == 0 {
+	if os.args.len == 0 {
 		// we are early in the bootstrap, os.args has not been initialized yet :-|
 		return ''
 	}
-	mut exepath := args[0]
+	mut exepath := os.args[0]
 	$if windows {
 		if !exepath.contains('.exe') {
 			exepath += '.exe'
@@ -342,7 +342,7 @@ fn executable_fallback() string {
 	}
 	if !is_abs_path(exepath) {
 		if exepath.contains(path_separator) {
-			exepath = join_path(wd_at_startup, exepath)
+			exepath = join_path(os.wd_at_startup, exepath)
 		} else {
 			// no choice but to try to walk the PATH folders :-| ...
 			foundpath := find_abs_path_of_executable(exepath) or { '' }

vlib/os/os_test.v

@@ -12,21 +12,21 @@ const (
 const args_at_start = os.args.clone()
 
 fn testsuite_begin() {
-	eprintln('testsuite_begin, tfolder = $tfolder')
-	os.rmdir_all(tfolder)
-	assert !os.is_dir(tfolder)
-	os.mkdir_all(tfolder)
-	os.chdir(tfolder)
-	assert os.is_dir(tfolder)
+	eprintln('testsuite_begin, tfolder = $main.tfolder')
+	os.rmdir_all(main.tfolder)
+	assert !os.is_dir(main.tfolder)
+	os.mkdir_all(main.tfolder)
+	os.chdir(main.tfolder)
+	assert os.is_dir(main.tfolder)
 	// println('args_at_start: $args_at_start')
-	assert args_at_start.len > 0
-	assert args_at_start == os.args
+	assert main.args_at_start.len > 0
+	assert main.args_at_start == os.args
 }
 
 fn testsuite_end() {
 	os.chdir(os.wd_at_startup)
-	os.rmdir_all(tfolder)
-	assert !os.is_dir(tfolder)
+	os.rmdir_all(main.tfolder)
+	assert !os.is_dir(main.tfolder)
 	// eprintln('testsuite_end  , tfolder = $tfolder removed.')
 }
 
@@ -434,8 +434,8 @@ struct IntPoint {
 
 fn test_write_file_array_bytes() {
 	fpath := './abytes.bin'
-	mut arr := []byte{len: maxn}
-	for i in 0 .. maxn {
+	mut arr := []byte{len: main.maxn}
+	for i in 0 .. main.maxn {
 		arr[i] = 65 + byte(i)
 	}
 	os.write_file_array(fpath, arr)
@@ -447,14 +447,14 @@ fn test_write_file_array_bytes() {
 
 fn test_write_file_array_structs() {
 	fpath := './astructs.bin'
-	mut arr := []IntPoint{len: maxn}
-	for i in 0 .. maxn {
+	mut arr := []IntPoint{len: main.maxn}
+	for i in 0 .. main.maxn {
 		arr[i] = IntPoint{65 + i, 65 + i + 10}
 	}
 	os.write_file_array(fpath, arr)
 	rarr := os.read_file_array<IntPoint>(fpath)
 	assert rarr == arr
-	assert rarr.len == maxn
+	assert rarr.len == main.maxn
 	// eprintln( rarr.str().replace('\n', ' ').replace('},', '},\n'))
 }
 

vlib/os/os_windows.c.v

@@ -199,11 +199,12 @@ const (
 fn ptr_win_get_error_msg(code u32) voidptr {
 	mut buf := voidptr(0)
 	// Check for code overflow
-	if code > u32(max_error_code) {
+	if code > u32(os.max_error_code) {
 		return buf
 	}
-	C.FormatMessage(format_message_allocate_buffer | format_message_from_system | format_message_ignore_inserts,
-		0, code, C.MAKELANGID(lang_neutral, sublang_default), voidptr(&buf), 0, 0)
+	C.FormatMessage(os.format_message_allocate_buffer | os.format_message_from_system | os.format_message_ignore_inserts,
+		0, code, C.MAKELANGID(os.lang_neutral, os.sublang_default), voidptr(&buf), 0,
+		0)
 	return buf
 }