selftests/bpf: Better error messages for ima_setup.sh failures
Subsystems (3)
PATCH 1/1 selftests/bpf: Better error messages for ima_setup.sh failures
The current implementation uses the CHECK_FAIL macro which does not provide useful error messages when the script fails. Use the CHECK macro instead and provide more descriptive messages to aid debugging.
Signed-off-by KP Singh <[email protected]>
--- tools/testing/selftests/bpf/prog_tests/test_ima.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/prog_tests/test_ima.c +4 -2
@@ -68,7 +68,8 @@ void test_test_ima(void) goto close_prog;snprintf (cmd,sizeof (cmd),"./ima_setup.sh setup %s" , measured_dir); -if (CHECK_FAIL (system (cmd))) + err =system (cmd); +if (CHECK (err,"failed to run command" ,"%s, errno = %d\n" , cmd, errno)) goto close_clean; err =run_measured_process (measured_dir, &skel->bss->monitored_pid);
@@ -81,7 +82,8 @@ void test_test_ima(void) close_clean:snprintf (cmd,sizeof (cmd),"./ima_setup.sh cleanup %s" , measured_dir); -CHECK_FAIL (system (cmd)); + err =system (cmd); +CHECK (err,"failed to run command" ,"%s, errno = %d\n" , cmd, errno); close_prog:ima__destroy (skel); }
Signature · 1 line
2.31.0.rc2.261.g7f71774620-goog
Quoted 7 lines · KP Singh
The current implementation uses the
CHECK_FAILmacro which does not provide useful error messages when the script fails. Use the CHECK macro instead and provide more descriptive messages to aid debugging.Signed-off-by KP Singh <[email protected]>---
This was applied to bpf-next, but commit bot doesn't seem very attentive at the moment :) Thanks for improvements!
Quoted 30 lines
tools/testing/selftests/bpf/prog_tests/test_ima.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)tools/testing/selftests/bpf/prog_tests/test_ima.c +4
-3@@ -68,7 +68,8 @@ void test_test_ima(void) goto close_prog;snprintf (cmd,sizeof (cmd),"./ima_setup.sh setup %s" , measured_dir); -if (CHECK_FAIL (system (cmd))) + err =system (cmd); +if (CHECK (err,"failed to run command" ,"%s, errno = %d\n" , cmd, errno)) goto close_clean; err =run_measured_process (measured_dir, &skel->bss->monitored_pid);@@ -81,7 +82,8 @@ void test_test_ima(void) close_clean:snprintf (cmd,sizeof (cmd),"./ima_setup.sh cleanup %s" , measured_dir); -CHECK_FAIL (system (cmd)); + err =system (cmd); +CHECK (err,"failed to run command" ,"%s, errno = %d\n" , cmd, errno); close_prog:ima__destroy (skel); } --2.31.0.rc2.261.g7f71774620-goog