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

Merge tag 'linux-kselftest-4.18-rc2' of... 

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

Pull kselftest fixes from Shuah Khan:

 - fix new sparc64 adi driver test compile errors on non-sparc systems

 - fix config fragment for sync framework for improved test coverage

 - fix several tests to return correct Kselftest skip code

* tag 'linux-kselftest-4.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: sparc64: Add missing SPDX License Identifiers
  selftests: sparc64: delete RUN_TESTS and EMIT_TESTS overrides
  selftests: sparc64: Fix to do nothing on non-sparc64
  selftests: sync: add config fragment for testing sync framework
  selftests: vm: return Kselftest Skip code for skipped tests
  selftests: zram: return Kselftest Skip code for skipped tests
  selftests: user: return Kselftest Skip code for skipped tests
  selftests: sysctl: return Kselftest Skip code for skipped tests
  selftests: static_keys: return Kselftest Skip code for skipped tests
  selftests: pstore: return Kselftest Skip code for skipped tests
parents 81f9c4e4 eb83d5f7

tools/testing/selftests/pstore/pstore_post_reboot_tests

+4 −1
Original line number Original line Diff line number Diff line
@@ -7,13 +7,16 @@ 
#

#

# Released under the terms of the GPL v2.

# Released under the terms of the GPL v2.





# Kselftest framework requirement - SKIP code is 4.

ksft_skip=4



. ./common_tests

. ./common_tests





if [ -e $REBOOT_FLAG  ]; then

if [ -e $REBOOT_FLAG  ]; then

    rm $REBOOT_FLAG

    rm $REBOOT_FLAG

else

else

    prlog "pstore_crash_test has not been executed yet. we skip further tests."

    prlog "pstore_crash_test has not been executed yet. we skip further tests."

    exit 0

    exit $ksft_skip

fi

fi





prlog -n "Mounting pstore filesystem ... "

prlog -n "Mounting pstore filesystem ... "

tools/testing/selftests/sparc64/Makefile

+12 −8
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

uname_M := $(shell uname -m 2>/dev/null || echo not)

ARCH ?= $(shell echo $(uname_M) | sed -e s/x86_64/x86/)



ifneq ($(ARCH),sparc64)

nothing:

.PHONY: all clean run_tests install

.SILENT:

else



SUBDIRS := drivers

SUBDIRS := drivers





TEST_PROGS := run.sh

TEST_PROGS := run.sh







.PHONY: all clean

.PHONY: all clean





include ../lib.mk

include ../lib.mk
@@ -18,10 +29,6 @@ all: 
		fi \

		fi \

	done

	done





override define RUN_TESTS

	@cd $(OUTPUT); ./run.sh

endef



override define INSTALL_RULE

override define INSTALL_RULE

	mkdir -p $(INSTALL_PATH)

	mkdir -p $(INSTALL_PATH)

	install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES)

	install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES)
@@ -33,10 +40,6 @@ override define INSTALL_RULE 
	done;

	done;

endef

endef





override define EMIT_TESTS

	echo "./run.sh"

endef



override define CLEAN

override define CLEAN

	@for DIR in $(SUBDIRS); do		\

	@for DIR in $(SUBDIRS); do		\

		BUILD_TARGET=$(OUTPUT)/$$DIR;	\

		BUILD_TARGET=$(OUTPUT)/$$DIR;	\
@@ -44,3 +47,4 @@ override define CLEAN 
		make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\

		make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\

	done

	done

endef

endef

endif

tools/testing/selftests/sparc64/drivers/Makefile

+1 −1
Original line number Original line Diff line number Diff line 


# SPDX-License-Identifier: GPL-2.0

INCLUDEDIR := -I.

INCLUDEDIR := -I.

CFLAGS := $(CFLAGS) $(INCLUDEDIR) -Wall -O2 -g

CFLAGS := $(CFLAGS) $(INCLUDEDIR) -Wall -O2 -g

tools/testing/selftests/static_keys/test_static_keys.sh

+13 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,19 @@ 
# SPDX-License-Identifier: GPL-2.0

# SPDX-License-Identifier: GPL-2.0

# Runs static keys kernel module tests

# Runs static keys kernel module tests





# Kselftest framework requirement - SKIP code is 4.

ksft_skip=4



if ! /sbin/modprobe -q -n test_static_key_base; then

	echo "static_key: module test_static_key_base is not found [SKIP]"

	exit $ksft_skip

fi



if ! /sbin/modprobe -q -n test_static_keys; then

	echo "static_key: module test_static_keys is not found [SKIP]"

	exit $ksft_skip

fi



if /sbin/modprobe -q test_static_key_base; then

if /sbin/modprobe -q test_static_key_base; then

	if /sbin/modprobe -q test_static_keys; then

	if /sbin/modprobe -q test_static_keys; then

		echo "static_key: ok"

		echo "static_key: ok"

tools/testing/selftests/sync/config

0 → 100644
+4 −0
Original line number Original line Diff line number Diff line 
CONFIG_STAGING=y

CONFIG_ANDROID=y

CONFIG_SYNC=y

CONFIG_SW_SYNC=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE