Skip to content

Commit 511361f

Browse files
thecharlesjenkinsPaul Walmsley
authored andcommitted
selftests: riscv: Add braces around EXPECT_EQ()
EXPECT_EQ() expands to multiple lines, breaking up one-line if statements. This issue was not present in the patch on the mailing list but was instead introduced by the maintainer when attempting to fix up checkpatch warnings. Add braces around EXPECT_EQ() to avoid the error even though checkpatch suggests them to be removed: validate_v_ptrace.c:626:17: error: ‘else’ without a previous ‘if’ Fixes: 3789d5e ("selftests: riscv: verify syscalls discard vector context") Fixes: 30eb191 ("selftests: riscv: verify ptrace rejects invalid vector csr inputs") Fixes: 849f05a ("selftests: riscv: verify ptrace accepts valid vector csr values") Signed-off-by: Charlie Jenkins <thecharlesjenkins@gmail.com> Reviewed-and-tested-by: Sergey Matyukevich <geomatsi@gmail.com> Link: https://patch.msgid.link/20260309-fix_selftests-v2-2-9d5a553a531e@gmail.com Signed-off-by: Paul Walmsley <pjw@kernel.org>
1 parent 87ad7cc commit 511361f

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

tools/testing/selftests/riscv/vector/validate_v_ptrace.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,11 @@ TEST(ptrace_v_syscall_clobbering)
290290

291291
/* verify initial vsetvli settings */
292292

293-
if (is_xtheadvector_supported())
293+
if (is_xtheadvector_supported()) {
294294
EXPECT_EQ(5UL, regset_data->vtype);
295-
else
295+
} else {
296296
EXPECT_EQ(9UL, regset_data->vtype);
297+
}
297298

298299
EXPECT_EQ(regset_data->vlenb, regset_data->vl);
299300
EXPECT_EQ(vlenb, regset_data->vlenb);
@@ -619,10 +620,11 @@ TEST_F(v_csr_invalid, ptrace_v_invalid_values)
619620

620621
/* verify initial vsetvli settings */
621622

622-
if (is_xtheadvector_supported())
623+
if (is_xtheadvector_supported()) {
623624
EXPECT_EQ(5UL, regset_data->vtype);
624-
else
625+
} else {
625626
EXPECT_EQ(9UL, regset_data->vtype);
627+
}
626628

627629
EXPECT_EQ(regset_data->vlenb, regset_data->vl);
628630
EXPECT_EQ(vlenb, regset_data->vlenb);
@@ -827,10 +829,11 @@ TEST_F(v_csr_valid, ptrace_v_valid_values)
827829

828830
/* verify initial vsetvli settings */
829831

830-
if (is_xtheadvector_supported())
832+
if (is_xtheadvector_supported()) {
831833
EXPECT_EQ(5UL, regset_data->vtype);
832-
else
834+
} else {
833835
EXPECT_EQ(9UL, regset_data->vtype);
836+
}
834837

835838
EXPECT_EQ(regset_data->vlenb, regset_data->vl);
836839
EXPECT_EQ(vlenb, regset_data->vlenb);

0 commit comments

Comments
 (0)