From 63a85c16c9b5095a8683f8c22b6472a57edb5d7f Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Fri, 15 May 2026 10:48:28 +0300 Subject: [PATCH] tests: fix Windows CI path and object-link checks --- vlib/v/pref/pref_test.v | 6 ++++-- .../compile_obj_file_and_link_separately/abc/module_in_v.v | 2 +- .../compile_obj_file_and_link_separately/main_in_c.c | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/vlib/v/pref/pref_test.v b/vlib/v/pref/pref_test.v index a656e562c..938c8cbe8 100644 --- a/vlib/v/pref/pref_test.v +++ b/vlib/v/pref/pref_test.v @@ -532,8 +532,10 @@ fn test_generate_c_project_creates_build_files() { assert os.is_file(os.join_path(output_dir, rel_path)) } build_command := os.read_file(os.join_path(output_dir, 'build_command.txt')) or { panic(err) } - assert normalized_build_path(build_command).contains(normalized_build_path(os.join_path(output_dir, - 'json.c'))) + generated_c_path := os.join_path(output_dir, 'json.c') + normalized_build_command := normalized_build_path(build_command) + assert normalized_build_command.contains(normalized_build_path(generated_c_path)) + || normalized_build_command.contains(normalized_build_path(os.short_path(generated_c_path))) assert build_command.contains('cJSON.c') assert !build_command.contains('.tmp.c') assert !build_command.contains('.module.') diff --git a/vlib/v/slow_tests/run_project_folders/compile_obj_file_and_link_separately/abc/module_in_v.v b/vlib/v/slow_tests/run_project_folders/compile_obj_file_and_link_separately/abc/module_in_v.v index 8132ab2bc..41251d93e 100644 --- a/vlib/v/slow_tests/run_project_folders/compile_obj_file_and_link_separately/abc/module_in_v.v +++ b/vlib/v/slow_tests/run_project_folders/compile_obj_file_and_link_separately/abc/module_in_v.v @@ -1,6 +1,6 @@ module abc -@[markused] +@[export: 'abc_addition'] pub fn addition(x int, y int) int { return x + y } diff --git a/vlib/v/slow_tests/run_project_folders/compile_obj_file_and_link_separately/main_in_c.c b/vlib/v/slow_tests/run_project_folders/compile_obj_file_and_link_separately/main_in_c.c index ee2dabe3e..1c743ee03 100644 --- a/vlib/v/slow_tests/run_project_folders/compile_obj_file_and_link_separately/main_in_c.c +++ b/vlib/v/slow_tests/run_project_folders/compile_obj_file_and_link_separately/main_in_c.c @@ -1,7 +1,7 @@ #include -extern int abc__addition(int x, int y); +extern int abc_addition(int x, int y); int main() { - int res = abc__addition(10,20); + int res = abc_addition(10,20); printf("Result of addition: %d\n", res); return 0; } -- 2.39.5