tests: arch: Fix zassert string

Fix wrong parameters used in zassert macros.

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

Author: nordic-krch

tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c

@@ -105,8 +105,7 @@ ZTEST(vector_table, test_arm_irq_vector_table)
 	}
 
 	zassert_true((k_sem_take(&sem[0], K_NO_WAIT) || k_sem_take(&sem[1], K_NO_WAIT) ||
-		      k_sem_take(&sem[2], K_NO_WAIT)),
-		     NULL);
+		      k_sem_take(&sem[2], K_NO_WAIT)));
 
 	for (int ii = 0; ii < 3; ii++) {
 #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) || defined(CONFIG_SOC_TI_LM3S6965_QEMU)
@@ -129,8 +128,7 @@ ZTEST(vector_table, test_arm_irq_vector_table)
 	__ISB(); /* Ensure that IRQ is executed */
 
 	zassert_false((k_sem_take(&sem[0], K_NO_WAIT) || k_sem_take(&sem[1], K_NO_WAIT) ||
-		       k_sem_take(&sem[2], K_NO_WAIT)),
-		      NULL);
+		       k_sem_take(&sem[2], K_NO_WAIT)));
 }
 
 typedef void (*vth)(void); /* Vector Table Handler */

tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c

@@ -147,10 +147,8 @@ static void verify_fp_callee_saved(const struct _preempt_float *src,
 		     (src->s27 == dst->s27) && (src->s28 == dst->s28) &&
 		     (src->s29 == dst->s29) && (src->s30 == dst->s30) &&
 		     (src->s31 == dst->s31),
-		     " got: 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x"
-		     " 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x\n"
-		     " expected:  0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x"
-		     " 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x 0x%0x\n",
+		     " got: %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f\n"
+		     " expected:  %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f\n",
 		     (double)src->s16, (double)src->s17, (double)src->s18, (double)src->s19,
 		     (double)src->s20, (double)src->s21, (double)src->s22, (double)src->s23,
 		     (double)src->s24, (double)src->s25, (double)src->s26, (double)src->s27,

tests/arch/arm/arm_tz_wrap_func/src/main.c

@@ -80,7 +80,7 @@ ZTEST(tz_wrap_func, test_tz_wrap_func)
 	msp1 = __get_MSP();
 	psp1 = __get_PSP();
 
-	zassert_equal(foo1_retval, wrap_foo1(foo1_arg1, foo1_arg2, foo1_arg3, foo1_arg4), NULL);
+	zassert_equal(foo1_retval, wrap_foo1(foo1_arg1, foo1_arg2, foo1_arg3, foo1_arg4));
 
 	zassert_equal(msp1, __get_MSP());
 	zassert_equal(psp1, __get_PSP());

tests/arch/common/semihost/src/main.c

@@ -17,7 +17,7 @@ ZTEST(semihost, test_file_ops)
 
 	/* Open in write mode */
 	fd = semihost_open(test_file, SEMIHOST_OPEN_WB);
-	zassert_true(fd > 0, "Bad handle (%d)", fd);
+	zassert_true(fd > 0, "Bad handle (%ld)", fd);
 	zassert_equal(semihost_flen(fd), 0, "File not empty");
 
 	/* Write some data */
@@ -35,12 +35,12 @@ ZTEST(semihost, test_file_ops)
 
 	/* Open the same file again for reading */
 	fd = semihost_open(test_file, SEMIHOST_OPEN_RB);
-	zassert_true(fd > 0, "Bad handle (%d)", fd);
+	zassert_true(fd > 0, "Bad handle (%ld)", fd);
 	zassert_equal(semihost_flen(fd), 2 * sizeof(w_buffer), "Data not preserved");
 
 	/* Check reading data */
 	read = semihost_read(fd, r_buffer, sizeof(r_buffer));
-	zassert_equal(read, sizeof(r_buffer), "Read failed %d", read);
+	zassert_equal(read, sizeof(r_buffer), "Read failed %ld", read);
 	zassert_mem_equal(r_buffer, w_buffer, sizeof(r_buffer), "Data not read");
 	read = semihost_read(fd, r_buffer, sizeof(r_buffer));
 	zassert_equal(read, sizeof(r_buffer), "Read failed");
@@ -63,7 +63,7 @@ ZTEST(semihost, test_file_ops)
 
 	/* Opening again in write mode should erase the file */
 	fd = semihost_open(test_file, SEMIHOST_OPEN_WB);
-	zassert_true(fd > 0, "Bad handle (%d)", fd);
+	zassert_true(fd > 0, "Bad handle (%ld)", fd);
 	zassert_equal(semihost_flen(fd), 0, "File not empty");
 	zassert_equal(semihost_close(fd), 0, "Close failed");
 }