]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
selftests: riscv: Add braces around EXPECT_EQ()
authorCharlie Jenkins <thecharlesjenkins@gmail.com>
Tue, 10 Mar 2026 01:52:11 +0000 (18:52 -0700)
committerPaul Walmsley <pjw@kernel.org>
Sun, 5 Apr 2026 00:37:57 +0000 (18:37 -0600)
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: 3789d5eecd5a ("selftests: riscv: verify syscalls discard vector context")
Fixes: 30eb191c895b ("selftests: riscv: verify ptrace rejects invalid vector csr inputs")
Fixes: 849f05ae1ea6 ("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>
tools/testing/selftests/riscv/vector/validate_v_ptrace.c

index 7ae6fede496f6f9c006e7dcc769a290bf18e7d95..74b6f6bcf0676170bea8c05bfdb611b02689632d 100644 (file)
@@ -290,10 +290,11 @@ TEST(ptrace_v_syscall_clobbering)
 
                /* verify initial vsetvli settings */
 
-               if (is_xtheadvector_supported())
+               if (is_xtheadvector_supported()) {
                        EXPECT_EQ(5UL, regset_data->vtype);
-               else
+               } else {
                        EXPECT_EQ(9UL, regset_data->vtype);
+               }
 
                EXPECT_EQ(regset_data->vlenb, regset_data->vl);
                EXPECT_EQ(vlenb, regset_data->vlenb);
@@ -619,10 +620,11 @@ TEST_F(v_csr_invalid, ptrace_v_invalid_values)
 
                /* verify initial vsetvli settings */
 
-               if (is_xtheadvector_supported())
+               if (is_xtheadvector_supported()) {
                        EXPECT_EQ(5UL, regset_data->vtype);
-               else
+               } else {
                        EXPECT_EQ(9UL, regset_data->vtype);
+               }
 
                EXPECT_EQ(regset_data->vlenb, regset_data->vl);
                EXPECT_EQ(vlenb, regset_data->vlenb);
@@ -827,10 +829,11 @@ TEST_F(v_csr_valid, ptrace_v_valid_values)
 
                /* verify initial vsetvli settings */
 
-               if (is_xtheadvector_supported())
+               if (is_xtheadvector_supported()) {
                        EXPECT_EQ(5UL, regset_data->vtype);
-               else
+               } else {
                        EXPECT_EQ(9UL, regset_data->vtype);
+               }
 
                EXPECT_EQ(regset_data->vlenb, regset_data->vl);
                EXPECT_EQ(vlenb, regset_data->vlenb);