Commit c578ddb3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-5.7-rc3' of... 

Merge tag 'linux-kselftest-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fixes from Shuah Khan:
 "This consists of fixes to runner scripts and individual test run-time
  bugs. Includes fixes to tpm2 and memfd test run-time regressions"

* tag 'linux-kselftest-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/ipc: Fix test failure seen after initial test run
  Revert "Kernel selftests: tpm2: check for tpm support"
  selftests/ftrace: Add CONFIG_SAMPLE_FTRACE_DIRECT=m kconfig
  selftests/seccomp: allow clock_nanosleep instead of nanosleep
  kselftest/runner: allow to properly deliver signals to tests
  selftests/harness: fix spelling mistake "SIGARLM" -> "SIGALRM"
  selftests: Fix memfd test run-time regression
  selftests: vm: Fix 64-bit test builds for powerpc64le
  selftests: vm: Do not override definition of ARCH
parents 18bf3408 b87080ea

tools/testing/selftests/ftrace/config

+1 −0
Original line number Diff line number Diff line
@@ -11,5 +11,6 @@ CONFIG_PREEMPTIRQ_DELAY_TEST=m 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_SAMPLES=y

CONFIG_SAMPLE_FTRACE_DIRECT=m

CONFIG_SAMPLE_TRACE_PRINTK=m

CONFIG_KALLSYMS_ALL=y

tools/testing/selftests/ipc/msgque.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ int dump_queue(struct msgque_data *msgque) 
	for (kern_id = 0; kern_id < 256; kern_id++) {

		ret = msgctl(kern_id, MSG_STAT, &ds);

		if (ret < 0) {

			if (errno == -EINVAL)

			if (errno == EINVAL)

				continue;

			printf("Failed to get stats for IPC queue with id %d\n",

					kern_id);

tools/testing/selftests/kselftest/runner.sh

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ tap_timeout() 
{

	# Make sure tests will time out if utility is available.

	if [ -x /usr/bin/timeout ] ; then

		/usr/bin/timeout "$kselftest_timeout" "$1"

		/usr/bin/timeout --foreground "$kselftest_timeout" "$1"

	else

		"$1"

	fi

tools/testing/selftests/kselftest_harness.h

+3 −3
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ static void __timeout_handler(int sig, siginfo_t *info, void *ucontext) 
	/* Sanity check handler execution environment. */

	if (!t) {

		fprintf(TH_LOG_STREAM,

			"no active test in SIGARLM handler!?\n");

			"no active test in SIGALRM handler!?\n");

		abort();

	}

	if (sig != SIGALRM || sig != info->si_signo) {
@@ -731,7 +731,7 @@ void __wait_for_test(struct __test_metadata *t) 
	if (sigaction(SIGALRM, &action, &saved_action)) {

		t->passed = 0;

		fprintf(TH_LOG_STREAM,

			"%s: unable to install SIGARLM handler\n",

			"%s: unable to install SIGALRM handler\n",

			t->name);

		return;

	}
@@ -743,7 +743,7 @@ void __wait_for_test(struct __test_metadata *t) 
	if (sigaction(SIGALRM, &saved_action, NULL)) {

		t->passed = 0;

		fprintf(TH_LOG_STREAM,

			"%s: unable to uninstall SIGARLM handler\n",

			"%s: unable to uninstall SIGALRM handler\n",

			t->name);

		return;

	}

tools/testing/selftests/memfd/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ CFLAGS += -I../../../../include/uapi/ 
CFLAGS += -I../../../../include/

CFLAGS += -I../../../../usr/include/



TEST_GEN_PROGS := memfd_test fuse_test fuse_mnt

TEST_GEN_PROGS := memfd_test

TEST_PROGS := run_fuse_test.sh run_hugetlbfs_test.sh

TEST_GEN_FILES := fuse_test fuse_mnt



fuse_mnt.o: CFLAGS += $(shell pkg-config fuse --cflags)