tests: make 'v test-self' pass under msys2/MINGW64 (#20010)

vlang · Nov 28, 2023 · 46086c0 · 46086c0
1 parent 6bafc28
commit 46086c0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/cmd/tools/modules/testing/common.v b/cmd/tools/modules/testing/common.v
@@ -37,6 +37,8 @@ pub const fail_retry_delay_ms = get_fail_retry_delay_ms()
 
 pub const is_node_present = os.execute('node --version').exit_code == 0
 
+pub const is_go_present = os.execute('go version').exit_code == 0
+
 pub const all_processes = get_all_processes()
 
 pub const header_bytes_to_search_for_module_main = 500

diff --git a/cmd/tools/vtest-self.v b/cmd/tools/vtest-self.v
@@ -336,7 +336,11 @@ fn main() {
 
 	if !testing.is_node_present {
 		testroot := vroot + os.path_separator
-		tsession.skip_files << test_js_files.map(it.replace(testroot, ''))
+		tsession.skip_files << test_js_files.map(it.replace(testroot, '').replace('\\',
+			'/'))
+	}
+	if !testing.is_go_present {
+		tsession.skip_files << 'vlib/v/gen/golang/tests/golang_test.v'
 	}
 	testing.find_started_process('mysqld') or {
 		tsession.skip_files << 'vlib/db/mysql/mysql_orm_test.v'

diff --git a/vlib/os/os_windows.c.v b/vlib/os/os_windows.c.v
@@ -324,7 +324,7 @@ pub fn raw_execute(cmd string) Result {
 		lp_reserved: unsafe { nil }
 		lp_desktop: unsafe { nil }
 		lp_title: unsafe { nil }
-		cb: sizeof(C.PROCESS_INFORMATION)
+		cb: sizeof(StartupInfo)
 		h_std_input: child_stdin
 		h_std_output: child_stdout_write
 		h_std_error: child_stdout_write

diff --git a/vlib/v/gen/c/testdata/console_windows_program.vv b/vlib/v/gen/c/testdata/console_windows_program.vv
@@ -1,4 +1,4 @@
-// vtest vflags: -cc msvc -os windows
+// vtest vflags: -os windows
 
 @[console]
 fn main() {

diff --git a/vlib/v/gen/c/testdata/gui_windows_program.vv b/vlib/v/gen/c/testdata/gui_windows_program.vv
@@ -1,4 +1,4 @@
-// vtest vflags: -cc msvc -os windows
+// vtest vflags: -os windows
 import sokol
 
 const used_import = sokol.used_import

diff --git a/vlib/v/gen/c/testdata/gui_windows_program_with_console_tag.vv b/vlib/v/gen/c/testdata/gui_windows_program_with_console_tag.vv
@@ -1,4 +1,4 @@
-// vtest vflags: -cc msvc -os windows
+// vtest vflags: -os windows
 import sokol
 
 const used_import = sokol.used_import