diff options
| author |   Luis Chamberlain <mcgrof@kernel.org> | 2019-05-14 15:45:01 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-14 19:52:51 -0700 |
| commit | 5a12928ea8cf945ae66a115f1ad5c21c234285a8 (patch) | |
| tree | 89c4e468be88296f2c2cfabedf3bcf641d0023ca /tools/testing/selftests/sysctl/sysctl.sh | |
| parent | tools/testing/selftests/sysctl/sysctl.sh: remove superfluous test_reqs() (diff) | |
| download | linux-dev-5a12928ea8cf945ae66a115f1ad5c21c234285a8.tar.xz linux-dev-5a12928ea8cf945ae66a115f1ad5c21c234285a8.zip | |
tools/testing/selftests/sysctl/sysctl.sh: load module before testing for it
Currently the test script checks for the existence of the sysctl test
module's directory path prior to loading it. We must first try to load
the module prior to checking for that path. This fixes the order for
the load / test.
Link: http://lkml.kernel.org/r/20190320222831.8243-3-mcgrof@kernel.org
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: Eric Sandeen <sandeen@redhat.com>
Cc: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'tools/testing/selftests/sysctl/sysctl.sh')
| -rwxr-xr-x | tools/testing/selftests/sysctl/sysctl.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/sysctl/sysctl.sh b/tools/testing/selftests/sysctl/sysctl.sh index 87df7e52a97a..e0c8404da6b0 100755 --- a/tools/testing/selftests/sysctl/sysctl.sh +++ b/tools/testing/selftests/sysctl/sysctl.sh @@ -823,8 +823,8 @@ function parse_args() test_reqs allow_user_defaults check_production_sysctl_writes_strict -test_modprobe load_req_mod +test_modprobe trap "test_finish" EXIT |