On Tue 2019-07-16 09:34:14, Joe Lawrence wrote:
Add a skip() message function that stops the test, logs an explanation, and sets the "skip" return code (4).
Before loading a livepatch self-test kernel module, first verify that we've built and installed it by running a 'modprobe --dry-run'. This should catch a few environment issues, including !CONFIG_LIVEPATCH and !CONFIG_TEST_LIVEPATCH. In these cases, exit gracefully with the new skip() function.
Reported-by: Jiri Benc jbenc@redhat.com
Adding Jiri into CC to be sure that we really solved the original problem.
I get the following output when livepatching is not configured:
$> make run_tests TAP version 13 1..4 # selftests: livepatch: test-livepatch.sh # TEST: basic function patching ... SKIP: Failed modprobe --dry-run of module: test_klp_livepatch not ok 1 selftests: livepatch: test-livepatch.sh # SKIP # selftests: livepatch: test-callbacks.sh # TEST: target module before livepatch ... SKIP: Failed modprobe --dry-run of module: test_klp_callbacks_mod not ok 2 selftests: livepatch: test-callbacks.sh # SKIP # selftests: livepatch: test-shadow-vars.sh # TEST: basic shadow variable API ... SKIP: Failed modprobe --dry-run of module: test_klp_shadow_vars not ok 3 selftests: livepatch: test-shadow-vars.sh # SKIP # selftests: livepatch: test-state.sh # TEST: system state modification ... SKIP: Failed modprobe --dry-run of module: test_klp_state not ok 4 selftests: livepatch: test-state.sh # SKIP
Jiri, is it acceptable solution for you, please?
Suggested-by: Shuah Khan shuah@kernel.org Signed-off-by: Joe Lawrence joe.lawrence@redhat.com
Otherwise, the patch looks fine to me. If Jiri is fine then feel free to use:
Reviewed-by: Petr Mladek pmladek@suse.com
Best Regards, Petr