fix, re-enable more test that were fixed in the meantime

vlang · Oct 10, 2023 · 1131b55 · 1131b55
1 parent fbbd1cb
commit 1131b55
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 55 deletions.
diff --git a/.github/workflows/code_ci.yml b/.github/workflows/code_ci.yml
@@ -19,7 +19,7 @@ on:
       - '!**/windows_ci.yml'
 
 concurrency:
-  group: platform-ci-${{ github.event.pull_request.number || github.sha }}
+  group: code-ci-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/platform_ci.yml b/.github/workflows/platform_ci.yml
diff --git a/cmd/tools/modules/testing/common.v b/cmd/tools/modules/testing/common.v
@@ -219,18 +219,31 @@ pub fn new_test_session(_vargs string, will_compile bool) TestSession {
 			skip_files << 'examples/pendulum-simulation/parallel.v'
 			skip_files << 'examples/pendulum-simulation/parallel_with_iw.v'
 			skip_files << 'examples/pendulum-simulation/sequential.v'
+			if testing.github_job == 'tcc' {
+				// TODO: fix these by adding declarations for the missing functions in the prebuilt tcc
+				skip_files << 'vlib/net/mbedtls/mbedtls_compiles_test.v'
+				skip_files << 'vlib/net/ssl/ssl_compiles_test.v'
+			}
+		}
+		$if !linux {
+			if testing.github_job != 'tcc' {
+				skip_files << 'examples/c_interop_wkhtmltopdf.v' // needs installation of wkhtmltopdf from https://github.com/wkhtmltopdf/packaging/releases
+				skip_files << 'examples/call_v_from_python/test.v' // the example only makes sense to be compiled, when python is installed
+				skip_files << 'examples/call_v_from_ruby/test.v' // the example only makes sense to be compiled, when ruby is installed
+				// the ttf_test.v is not interactive, but needs X11 headers to be installed, which is done only on ubuntu-tcc for now
+				skip_files << 'vlib/x/ttf/ttf_test.v'
+				skip_files << 'vlib/vweb/vweb_app_test.v' // imports the `sqlite` module, which in turn includes sqlite3.h
+			}
+		}
+		$if !macos {
+			skip_files << 'examples/macos_tray/tray.v'
 		}
 		if testing.github_job == 'ubuntu-docker-musl' {
 			skip_files << 'vlib/net/openssl/openssl_compiles_test.v'
 		}
 		if testing.github_job == 'tests-sanitize-memory-clang' {
 			skip_files << 'vlib/net/openssl/openssl_compiles_test.v'
 		}
-		if testing.github_job == 'windows-tcc' {
-			// TODO: fix these by adding declarations for the missing functions in the prebuilt tcc
-			skip_files << 'vlib/net/mbedtls/mbedtls_compiles_test.v'
-			skip_files << 'vlib/net/ssl/ssl_compiles_test.v'
-		}
 		if testing.github_job != 'misc-tooling' {
 			// These examples need .h files that are produced from the supplied .glsl files,
 			// using by the shader compiler tools in https://github.com/floooh/sokol-tools-bin/archive/pre-feb2021-api-changes.tar.gz
@@ -246,17 +259,6 @@ pub fn new_test_session(_vargs string, will_compile bool) TestSession {
 			skip_files << 'examples/sokol/sounds/wav_player.v'
 			skip_files << 'examples/sokol/sounds/simple_sin_tones.v'
 		}
-		if testing.github_job != 'ubuntu-tcc' {
-			skip_files << 'examples/c_interop_wkhtmltopdf.v' // needs installation of wkhtmltopdf from https://github.com/wkhtmltopdf/packaging/releases
-			skip_files << 'examples/call_v_from_python/test.v' // the example only makes sense to be compiled, when python is installed
-			skip_files << 'examples/call_v_from_ruby/test.v' // the example only makes sense to be compiled, when ruby is installed
-			// the ttf_test.v is not interactive, but needs X11 headers to be installed, which is done only on ubuntu-tcc for now
-			skip_files << 'vlib/x/ttf/ttf_test.v'
-			skip_files << 'vlib/vweb/vweb_app_test.v' // imports the `sqlite` module, which in turn includes sqlite3.h
-		}
-		$if !macos {
-			skip_files << 'examples/macos_tray/tray.v'
-		}
 		// examples/wasm/mandelbrot/mandelbrot.v requires special compilation flags: `-b wasm -os browser`, skip it for now:
 		skip_files << 'examples/wasm/mandelbrot/mandelbrot.v'
 

diff --git a/cmd/tools/vtest-self.v b/cmd/tools/vtest-self.v
@@ -350,11 +350,10 @@ fn main() {
 		tsession.skip_files << 'vlib/db/pg/pg_orm_test.v'
 	}
 
-	if github_job == 'windows-tcc' {
-		tsession.skip_files << 'vlib/v/tests/project_with_cpp_code/compiling_cpp_files_with_a_cplusplus_compiler_test.v'
-		// TODO: fix these ASAP
-		tsession.skip_files << 'vlib/net/tcp_test.v'
-		tsession.skip_files << 'vlib/net/udp_test.v'
+	$if windows {
+		if github_job == 'tcc' {
+			tsession.skip_files << 'vlib/v/tests/project_with_cpp_code/compiling_cpp_files_with_a_cplusplus_compiler_test.v'
+		}
 	}
 
 	if !os.exists('cmd/tools/builders/wasm_builder') {