Commit 903b77c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-4.21-rc1' of... 

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

Pull Kselftest updates from Shuah Khan:

 - fixes and improvements to the framework, and individual tests

 - a new media test for IR encoders from Sean Young

 - a new watchdog test option to find time left on a timer

* tag 'linux-kselftest-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: Fix test errors related to lib.mk khdr target
  fix dma-buf/udmabuf selftest
  selftests: watchdog: fix spelling mistake "experies" -> "expires"
  selftests: watchdog: Add gettimeleft command line arg
  selftests: do not macro-expand failed assertion expressions
  selftests/ftrace: Fix invalid SPDX identifiers
  selftests: gpio: Find libmount with pkg-config if available
  selftests: firmware: add CONFIG_FW_LOADER_USER_HELPER_FALLBACK to config
  selftests: firmware: remove use of non-standard diff -Z option
  media: rc: self test for IR encoders and decoders
parents 457fa346 283ac6d5

tools/testing/selftests/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ TARGETS += capabilities 
TARGETS += cgroup

TARGETS += cpufreq

TARGETS += cpu-hotplug

TARGETS += drivers/dma-buf

TARGETS += efivarfs

TARGETS += exec

TARGETS += filesystems
@@ -15,6 +16,7 @@ TARGETS += futex 
TARGETS += gpio

TARGETS += intel_pstate

TARGETS += ipc

TARGETS += ir

TARGETS += kcmp

TARGETS += kvm

TARGETS += lib

tools/testing/selftests/drivers/dma-buf/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2,4 +2,6 @@ CFLAGS += -I../../../../../usr/include/ 


TEST_GEN_PROGS := udmabuf



top_srcdir ?=../../../../..



include ../../lib.mk

tools/testing/selftests/drivers/dma-buf/udmabuf.c

+9 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <unistd.h>

#include <string.h>

#include <errno.h>

#include <fcntl.h>

#include <linux/fcntl.h>

#include <malloc.h>



#include <sys/ioctl.h>
@@ -33,12 +33,19 @@ int main(int argc, char *argv[]) 
		exit(77);

	}



	memfd = memfd_create("udmabuf-test", MFD_CLOEXEC);

	memfd = memfd_create("udmabuf-test", MFD_ALLOW_SEALING);

	if (memfd < 0) {

		printf("%s: [skip,no-memfd]\n", TEST_PREFIX);

		exit(77);

	}



	ret = fcntl(memfd, F_ADD_SEALS, F_SEAL_SHRINK);

	if (ret < 0) {

		printf("%s: [skip,fcntl-add-seals]\n", TEST_PREFIX);

		exit(77);

	}





	size = getpagesize() * NUM_PAGES;

	ret = ftruncate(memfd, size);

	if (ret == -1) {

tools/testing/selftests/firmware/config

+1 −0
Original line number Diff line number Diff line 
CONFIG_TEST_FIRMWARE=y

CONFIG_FW_LOADER=y

CONFIG_FW_LOADER_USER_HELPER=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

tools/testing/selftests/firmware/fw_filesystem.sh

+3 −6
Original line number Diff line number Diff line
@@ -155,11 +155,8 @@ read_firmwares() 
{

	for i in $(seq 0 3); do

		config_set_read_fw_idx $i

		# Verify the contents are what we expect.

		# -Z required for now -- check for yourself, md5sum

		# on $FW and DIR/read_firmware will yield the same. Even

		# cmp agrees, so something is off.

		if ! diff -q -Z "$FW" $DIR/read_firmware 2>/dev/null ; then

		# Verify the contents match

		if ! diff -q "$FW" $DIR/read_firmware 2>/dev/null ; then

			echo "request #$i: firmware was not loaded" >&2

			exit 1

		fi
@@ -171,7 +168,7 @@ read_firmwares_expect_nofile() 
	for i in $(seq 0 3); do

		config_set_read_fw_idx $i

		# Ensures contents differ

		if diff -q -Z "$FW" $DIR/read_firmware 2>/dev/null ; then

		if diff -q "$FW" $DIR/read_firmware 2>/dev/null ; then

			echo "request $i: file was not expected to match" >&2

			exit 1

		fi

CRA Git | Maintained and supported by SUSTech CRA and CCSE