tests: all: Fix remaining issues reported by string validation

Fix issues reported by string validation which was added to strings
used in zassert macros.

Signed-off-by: Krzysztof Chruściński <[email protected]>

Author: nordic-krch

tests/bluetooth/controller/ctrl_isoal/src/sub_sets/isoal_test_rx.c

@@ -930,7 +930,7 @@ ZTEST(test_rx_unframed, test_rx_time_wrapping)
 		    -((int64_t)ISOAL_TIME_WRAPPING_POINT_US);
 	expected_result = ISOAL_TIME_WRAPPING_POINT_US + time_diff + 1;
 	result = isoal_get_wrapped_time_test(time_now, time_diff);
-	zassert_equal(result, expected_result, "%lu != %lu", result, expected_result);
+	zassert_equal(result, expected_result, "%u != %u", result, expected_result);
 
 	/* Maximum negative difference from maximum time */
 	time_now = ISOAL_TIME_WRAPPING_POINT_US;
@@ -939,14 +939,14 @@ ZTEST(test_rx_unframed, test_rx_time_wrapping)
 		    -((int64_t)ISOAL_TIME_WRAPPING_POINT_US);
 	expected_result = ISOAL_TIME_WRAPPING_POINT_US + time_diff;
 	result = isoal_get_wrapped_time_test(time_now, time_diff);
-	zassert_equal(result, expected_result, "%lu != %lu", result, expected_result);
+	zassert_equal(result, expected_result, "%u != %u", result, expected_result);
 
 	/* Maximum positive difference from maximum time */
 	time_now = ISOAL_TIME_WRAPPING_POINT_US;
 	time_diff = (time_wrapping_point == UINT32_MAX ? INT32_MAX : ISOAL_TIME_WRAPPING_POINT_US);
 	expected_result = time_diff - 1;
 	result = isoal_get_wrapped_time_test(time_now, time_diff);
-	zassert_equal(result, expected_result, "%lu != %lu", result, expected_result);
+	zassert_equal(result, expected_result, "%u != %u", result, expected_result);
 }
 
 /**

tests/bluetooth/controller/ctrl_isoal/src/sub_sets/isoal_test_tx.c

@@ -121,7 +121,7 @@ static void check_next_custom_source_pdu_write_test_sdu_payload(const uint8_t *d
 	for (size_t i = 0; i < custom_source_pdu_write_test_sdu_payloads.out_size[pos]; i++) {
 		zassert_equal(custom_source_pdu_write_test_sdu_payloads.out[pos][i],
 			      data[i],
-			      "[Line %lu] deviation at index %u, expected %u, got %u",
+			      "[Line %u] deviation at index %u, expected %u, got %u",
 			      line,
 			      i,
 			      data[i],
@@ -243,7 +243,7 @@ static isoal_status_t custom_source_pdu_emit_test(struct node_tx_iso *node_tx,
 			  source_pdu_emit_test_fake.arg0_##_typ);                                  \
 	zassert_equal(_payload_count,                                                              \
 		      source_pdu_emit_test_handler_fake.arg0_##_typ.payload_count,                 \
-		      "\t\t%u != %u",                                                              \
+		      "\t\t%llu != %u",                                                            \
 		      _payload_count,                                                              \
 		      source_pdu_emit_test_handler_fake.arg0_##_typ.payload_count);                \
 	zassert_equal(_sdu_fragments,                                                              \

tests/bluetooth/mesh/blob_io_flash/src/main.c

@@ -123,7 +123,7 @@ ZTEST(blob_io_flash, test_chunk_read)
 
 			err = blob_flash_stream.io.rd(&blob_flash_stream.io, &xfer, &block, &chunk);
 			zassert_equal(err, 0, "BLOB I/O read failed with err=%d off=%d len=%d",
-				      err, block.offset + chunk.offset, chunk.size);
+				      err, (int)(block.offset + chunk.offset), (int)chunk.size);
 
 			zassert_mem_equal(&chunk_data, &test_data[tests_data_offset], chunk.size,
 					  "Incorrect data written into flash");

tests/kernel/common/src/clock.c

@@ -137,12 +137,10 @@ ZTEST(clock, test_clock_cycle_32)
 	/*avoid cycle counter wrap around*/
 	if (c1 > c0) {
 		/* delta cycle should be greater than 1 milli-second*/
-		zassert_true((c1 - c0) >
-			     (sys_clock_hw_cycles_per_sec() / MSEC_PER_SEC),
-			     NULL);
+		zassert_true((c1 - c0) > (sys_clock_hw_cycles_per_sec() / MSEC_PER_SEC));
 		/* delta NS should be greater than 1 milli-second */
 		zassert_true((uint32_t)k_cyc_to_ns_floor64(c1 - c0) >
-			     (NSEC_PER_SEC / MSEC_PER_SEC), NULL);
+			     (NSEC_PER_SEC / MSEC_PER_SEC));
 	}
 }
 

tests/kernel/common/src/pow2.c

@@ -60,7 +60,7 @@ static void test_pow2_ceil_x(unsigned long test_value,
 	unsigned int result = Z_POW2_CEIL(x);
 
 	zassert_equal(result, expected_result,
-		      "ZPOW2_CEIL(%lu) returned %lu, expected %lu",
+		      "ZPOW2_CEIL(%lu) returned %ld, expected %lu",
 		      test_value, result, expected_result);
 }
 

tests/kernel/context/src/main.c

@@ -251,7 +251,7 @@ static void _test_kernel_cpu_idle(int atomic)
 		dt = k_uptime_ticks() - t0;
 		zassert_true(abs((int32_t) (dt - dur)) <= slop,
 			     "Inaccurate wakeup, idled for %d ticks, expected %d",
-			     dt, dur);
+			     (int)dt, dur);
 	}
 }
 

tests/kernel/interrupt/src/dynamic_isr.c

@@ -114,7 +114,7 @@ extern const void *x86_irq_args[];
 
 	/**TESTPOINT: pass word-sized parameter to interrupt */
 	zassert_equal(handler_test_result, ISR_DYN_ARG,
-			"parameter(0x%lx) in handler is not correct",
+			"parameter(0x%" PRIxPTR ") in handler is not correct",
 			handler_test_result);
 
 	trigger_irq(vector_num);

tests/kernel/semaphore/semaphore/src/main.c

@@ -972,7 +972,7 @@ ZTEST(semaphore, test_sem_measure_timeout_from_thread)
 
 	zassert_true((diff_ticks < SEC2MS(1)),
 		     "k_sem_take took too long: %d >= %d",
-		     diff_ticks, SEC2MS(1));
+		     (int)diff_ticks, SEC2MS(1));
 	k_thread_join(&sem_tid_1, K_FOREVER);
 }
 

tests/kernel/timer/starve/src/main.c

@@ -84,7 +84,7 @@ ZTEST(starve_fn, test_starve)
 
 		zassert_equal(na_capture, 0,
 			      "%sTimer alarm fired: %u\n",
-			      na_capture);
+			      tag(), na_capture);
 
 		k_timer_start(&tmr, K_MSEC(TIMER_DELAY_ms), K_NO_WAIT);
 

tests/kernel/timer/timer_api/src/main.c

@@ -791,7 +791,7 @@ ZTEST_USER(timer_api, test_timeout_abs)
 	} while (t0 != t1);
 
 	zassert_true(t0 + rem_ticks == exp_ticks,
-		     "Wrong remaining: now %lld rem %lld expires %lld (%d)",
+		     "Wrong remaining: now %lld rem %lld expires %lld (%lld)",
 		     (uint64_t)t0, (uint64_t)rem_ticks, (uint64_t)exp_ticks,
 		     t0+rem_ticks-exp_ticks);