From dca4a2ef662b7b9401b455c0bceaebf46ebdeebc Mon Sep 17 00:00:00 2001
From: Alexander Medvednikov <alexander@medvednikov.com>
Date: Sun, 17 May 2026 00:02:28 +0300
Subject: [PATCH] ci: fix gcc-windows CI failures and re-enable v2 test suite
 on macOS

- Skip test_path_devnull on all Windows (crashes on GCC/MinGW too, not just TCC)
- Fix coutput_test runner panic when a test exe crashes (report FAIL instead)
- Skip -cc clang tests on gcc-windows CI job
- Mark gg/text_rendering and sokol/gfx tests as flaky (GPU-dependent)
- Re-enable v2 test_all.sh in macOS CI
---
 .github/workflows/macos_ci.yml |  1 -
 vlib/gg/text_rendering_test.v  |  2 ++
 vlib/os/file_test.v            |  6 ++----
 vlib/sokol/gfx/gfx_test.v      |  2 ++
 vlib/v/gen/c/coutput_test.v    | 15 +++++++++++++--
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/macos_ci.yml b/.github/workflows/macos_ci.yml
index 12107233d..b676328ad 100644
--- a/.github/workflows/macos_ci.yml
+++ b/.github/workflows/macos_ci.yml
@@ -78,7 +78,6 @@ jobs:
       - name: V self compilation with -parallel-cc
         run: v run ci/macos_ci.vsh v_self_compilation_parallel_cc
       - name: v2 test suite
-        if: ${{ false }} # Temporarily disabled.
         run: bash cmd/v2/test_all.sh
       - name: Test password input
         run: v run ci/macos_ci.vsh test_password_input
diff --git a/vlib/gg/text_rendering_test.v b/vlib/gg/text_rendering_test.v
index 280bf831b..3675faa2d 100644
--- a/vlib/gg/text_rendering_test.v
+++ b/vlib/gg/text_rendering_test.v
@@ -1,4 +1,6 @@
 // vtest build: !msvc
+// vtest flaky: true
+// vtest retry: 1
 module gg
 
 import fontstash
diff --git a/vlib/os/file_test.v b/vlib/os/file_test.v
index 57935a9e1..cd38f477d 100644
--- a/vlib/os/file_test.v
+++ b/vlib/os/file_test.v
@@ -487,10 +487,8 @@ fn test_open_file_crlf_binary_mode() {
 
 fn test_path_devnull() {
 	$if windows {
-		$if tinyc {
-			// TCC crashes reading device files like \\.\nul on Windows.
-			return
-		}
+		// Reading device files like \\.\nul crashes on Windows (TCC, GCC/MinGW).
+		return
 	}
 	dump(os.path_devnull)
 	content := os.read_file(os.path_devnull)!
diff --git a/vlib/sokol/gfx/gfx_test.v b/vlib/sokol/gfx/gfx_test.v
index 0855bf9f6..1c158d01f 100644
--- a/vlib/sokol/gfx/gfx_test.v
+++ b/vlib/sokol/gfx/gfx_test.v
@@ -1,4 +1,6 @@
 // vtest build: !msvc
+// vtest flaky: true
+// vtest retry: 1
 module gfx
 
 import os
diff --git a/vlib/v/gen/c/coutput_test.v b/vlib/v/gen/c/coutput_test.v
index 534401109..301328fe3 100644
--- a/vlib/v/gen/c/coutput_test.v
+++ b/vlib/v/gen/c/coutput_test.v
@@ -56,6 +56,12 @@ fn test_out_files() {
 		pexe := os.join_path(output_path, '${basename}.exe')
 		//
 		file_options := get_file_options(path)
+		if user_os == 'windows' && file_options.vflags.contains('-cc clang') && gcc_path.len > 0
+			&& github_job.contains('gcc') {
+			eprintln('> skipping ${relpath} on gcc-windows, since it requires clang')
+			total_skips++
+			continue
+		}
 		alloptions := '-o ${os.quoted_path(pexe)} ${file_options.vflags}'
 		label := mj('v', file_options.vflags, 'run', relpath) + ' == ${mm(out_relpath)} '
 		//
@@ -70,8 +76,13 @@ fn test_out_files() {
 		run_ms := sw_run.elapsed().milliseconds()
 		//
 		if res.exit_code < 0 {
-			println('nope')
-			panic(res.output)
+			println('${term.red('FAIL')} C:${compile_ms:6}ms, R:${run_ms:2}ms ${label}')
+			println('  run crashed with exit code: ${res.exit_code}')
+			if res.output.len > 0 {
+				println(res.output)
+			}
+			total_errors++
+			continue
 		}
 		mut found := res.output.trim_right('\r\n').replace('\r\n', '\n')
 		mut expected := os.read_file(out_path)!
-- 
2.39.5