From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Jun 2020 17:03:12 +0000 (-0700)
Subject: Merge tag 'linux-kselftest-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~3640
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc2fb38c85508a875fc2e95f1e14e0bdcf59e1e9;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'linux-kselftest-5.8-rc1' of git://git./linux/kernel/git/shuah/linux-kselftest

Pull kselftest updates from Shuah Khan:
 "This consists of:

   - Several fixes from Masami Hiramatsu to improve coverage for lib and
     sysctl tests.

   - Clean up to vdso test and a new test for getcpu() from Mark Brown.

   - Add new gen_tar selftests Makefile target generate selftest package
     running "make gen_tar" in selftests directory from Veronika
     Kabatova.

   - Other miscellaneous fixes to timens, exec, tpm2 tests"

* tag 'linux-kselftest-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/sysctl: Make sysctl test driver as a module
  selftests/sysctl: Fix to load test_sysctl module
  lib: Make test_sysctl initialized as module
  lib: Make prime number generator independently selectable
  selftests/ftrace: Return unsupported if no error_log file
  selftests/ftrace: Use printf for backslash included command
  selftests/timens: handle a case when alarm clocks are not supported
  Kernel selftests: Add check if TPM devices are supported
  selftests: vdso: Add a selftest for vDSO getcpu()
  selftests: vdso: Use a header file to prototype parse_vdso API
  selftests: vdso: Rename vdso_test to vdso_test_gettimeofday
  selftests/exec: Verify execve of non-regular files fail
  selftests: introduce gen_tar Makefile target
---

fc2fb38c85508a875fc2e95f1e14e0bdcf59e1e9
diff --cc tools/testing/selftests/exec/Makefile
index 7f4527f,cfafa1f..4453b8f
--- a/tools/testing/selftests/exec/Makefile
+++ b/tools/testing/selftests/exec/Makefile
@@@ -3,9 -3,8 +3,9 @@@ CFLAGS = -Wal
  CFLAGS += -Wno-nonnull
  CFLAGS += -D_GNU_SOURCE
  
 +TEST_PROGS := binfmt_script
  TEST_GEN_PROGS := execveat
- TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir
+ TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir pipe
  # Makefile is a run-time dependency, since it's accessed by the execveat test
  TEST_FILES := Makefile
  
diff --cc tools/testing/selftests/sysctl/sysctl.sh
index 0aa8a86,c3459f9..19515dc
--- a/tools/testing/selftests/sysctl/sysctl.sh
+++ b/tools/testing/selftests/sysctl/sysctl.sh
@@@ -39,18 -39,7 +39,8 @@@ ALL_TESTS="$ALL_TESTS 0003:1:1:int_0002
  ALL_TESTS="$ALL_TESTS 0004:1:1:uint_0001"
  ALL_TESTS="$ALL_TESTS 0005:3:1:int_0003"
  ALL_TESTS="$ALL_TESTS 0006:50:1:bitmap_0001"
 +ALL_TESTS="$ALL_TESTS 0007:1:1:boot_int"
  
- test_modprobe()
- {
-        if [ ! -d $DIR ]; then
-                echo "$0: $DIR not present" >&2
-                echo "You must have the following enabled in your kernel:" >&2
-                cat $TEST_DIR/config >&2
-                exit $ksft_skip
-        fi
- }
- 
  function allow_user_defaults()
  {
  	if [ -z $DIR ]; then
@@@ -123,9 -112,10 +113,10 @@@ test_reqs(
  
  function load_req_mod()
  {
 -	if [ ! -d $DIR ]; then
 +	if [ ! -d $SYSCTL ]; then
  		if ! modprobe -q -n $TEST_DRIVER; then
  			echo "$0: module $TEST_DRIVER not found [SKIP]"
+ 			echo "You must set CONFIG_TEST_SYSCTL=m in your kernel" >&2
  			exit $ksft_skip
  		fi
  		modprobe $TEST_DRIVER