From 66946738fbcdad4ce810a04a868b4d0f05cf55b2 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Wed, 23 Jul 2025 17:10:10 +0300
Subject: [PATCH] tests: fix some of the notices/warnings/errors discovered
 through `find . |grep _test.v$ |xargs -i ./v -g -keepc -skip-running {}`

---
 vlib/math/bits/bits_test.v                | 14 +++++++-------
 vlib/v/gen/c/array.v                      |  1 +
 vlib/v/tests/global_fixed_arr_init_test.v |  1 +
 vlib/v/tests/init_global_test.v           |  3 +++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/vlib/math/bits/bits_test.v b/vlib/math/bits/bits_test.v
index 1dfe81a1f1..c588bbaf9e 100644
--- a/vlib/math/bits/bits_test.v
+++ b/vlib/math/bits/bits_test.v
@@ -15,7 +15,7 @@ fn test_bits() {
 	i = 1
 	for x in 0 .. 8 {
 		// C.printf("x:%02x lz: %d cmp: %d\n", i << x, leading_zeros_8(i << x), 7-x)
-		assert leading_zeros_8(u8(i << x)) == 7 - x
+		assert leading_zeros_8(u8(u8(i) << x)) == 7 - x
 	}
 
 	// 16 bit
@@ -48,7 +48,7 @@ fn test_bits() {
 	for x in 0 .. 9 {
 		// C.printf("x:%02x lz: %llu cmp: %d\n", u8(i), ones_count_8(u8(i)), x)
 		assert ones_count_8(u8(i)) == x
-		i = (i << 1) + 1
+		i = int(u32(i) << 1) + 1
 	}
 
 	// 16 bit
@@ -56,7 +56,7 @@ fn test_bits() {
 	for x in 0 .. 17 {
 		// C.printf("x:%04x lz: %llu cmp: %d\n", u16(i), ones_count_16(u16(i)), x)
 		assert ones_count_16(u16(i)) == x
-		i = (i << 1) + 1
+		i = int(u32(i) << 1) + 1
 	}
 
 	// 32 bit
@@ -64,7 +64,7 @@ fn test_bits() {
 	for x in 0 .. 33 {
 		// C.printf("x:%08x lz: %llu cmp: %d\n", u32(i), ones_count_32(u32(i)), x)
 		assert ones_count_32(u32(i)) == x
-		i = (i << 1) + 1
+		i = int(u32(i) << 1) + 1
 	}
 
 	// 64 bit
@@ -100,7 +100,7 @@ fn test_bits() {
 		}
 		// C.printf("x:%02x lz: %llu cmp: %d\n", u8(i), reverse_8(u8(i)), rv)
 		assert reverse_8(u8(i)) == rv
-		i = (i << 1) + 1
+		i = int(u32(i) << 1) + 1
 	}
 
 	// 16 bit
@@ -116,7 +116,7 @@ fn test_bits() {
 		}
 		// C.printf("x:%04x lz: %llu cmp: %d\n", u16(i), reverse_16(u16(i)), rv)
 		assert reverse_16(u16(i)) == rv
-		i = (i << 1) + 1
+		i = int(u32(i) << 1) + 1
 	}
 
 	// 32 bit
@@ -132,7 +132,7 @@ fn test_bits() {
 		}
 		// C.printf("x:%08x lz: %llu cmp: %d\n", u32(i), reverse_32(u32(i)), rv)
 		assert reverse_32(u32(i)) == rv
-		i = (i << 1) + 1
+		i = int(u32(i) << 1) + 1
 	}
 
 	// 64 bit
diff --git a/vlib/v/gen/c/array.v b/vlib/v/gen/c/array.v
index 920b15f901..3812e85607 100644
--- a/vlib/v/gen/c/array.v
+++ b/vlib/v/gen/c/array.v
@@ -869,6 +869,7 @@ fn (mut g Gen) gen_array_sort_call(node ast.CallExpr, compare_fn string, is_arra
 		g.expr(node.left)
 		g.write(', ${info.size}, sizeof(${elem_styp}), (voidptr)${compare_fn});')
 	}
+	g.writeln('')
 }
 
 fn (mut g Gen) gen_fixed_array_sorted_with_compare(node ast.CallExpr) {
diff --git a/vlib/v/tests/global_fixed_arr_init_test.v b/vlib/v/tests/global_fixed_arr_init_test.v
index 3fbf36467b..a7da309cb8 100644
--- a/vlib/v/tests/global_fixed_arr_init_test.v
+++ b/vlib/v/tests/global_fixed_arr_init_test.v
@@ -1,3 +1,4 @@
+@[has_globals]
 module main
 
 type Mat4 = [16]f32
diff --git a/vlib/v/tests/init_global_test.v b/vlib/v/tests/init_global_test.v
index c904627ee1..45248d47cf 100644
--- a/vlib/v/tests/init_global_test.v
+++ b/vlib/v/tests/init_global_test.v
@@ -1,3 +1,6 @@
+@[has_globals]
+module main
+
 // vtest retry: 2
 import sync