selftests: Extract run_kselftest.sh and generate stand-alone test list (f0f0a5df) · Commits · 戴 / test

tools/testing/selftests/Makefile

+7 −19

Original line number	Diff line number	Diff line
		@@ -206,6 +206,7 @@ KSFT_INSTALL_PATH := $(abspath $(KSFT_INSTALL_PATH))
		# Avoid changing the rest of the logic here and lib.mk.
		INSTALL_PATH := $(KSFT_INSTALL_PATH)
		ALL_SCRIPT := $(INSTALL_PATH)/run_kselftest.sh
		TEST_LIST := $(INSTALL_PATH)/kselftest-list.txt

		install: all
		ifdef INSTALL_PATH
		@@ -214,6 +215,8 @@ ifdef INSTALL_PATH
		install -m 744 kselftest/module.sh $(INSTALL_PATH)/kselftest/
		install -m 744 kselftest/runner.sh $(INSTALL_PATH)/kselftest/
		install -m 744 kselftest/prefix.pl $(INSTALL_PATH)/kselftest/
		install -m 744 run_kselftest.sh $(INSTALL_PATH)/
		rm -f $(TEST_LIST)
		@ret=1; \
		for TARGET in $(TARGETS); do \
		BUILD_TARGET=$$BUILD/$$TARGET; \
		@@ -222,33 +225,18 @@ ifdef INSTALL_PATH
		ret=$$((ret * $$?)); \
		done; exit $$ret;

		@# Ask all targets to emit their test scripts
		echo "#!/bin/sh" > $(ALL_SCRIPT)
		echo "BASE_DIR=\$$(realpath \$$(dirname \$$0))" >> $(ALL_SCRIPT)
		echo "cd \$$BASE_DIR" >> $(ALL_SCRIPT)
		echo ". ./kselftest/runner.sh" >> $(ALL_SCRIPT)
		echo "ROOT=\$$PWD" >> $(ALL_SCRIPT)
		echo "if [ \"\$$1\" = \"--summary\" ]; then" >> $(ALL_SCRIPT)
		echo " logfile=\$$BASE_DIR/output.log" >> $(ALL_SCRIPT)
		echo " cat /dev/null > \$$logfile" >> $(ALL_SCRIPT)
		echo "fi" >> $(ALL_SCRIPT)

		@# While building run_kselftest.sh skip also non-existent TARGET dirs:
		@# Ask all targets to emit their test scripts
		@# While building kselftest-list.text skip also non-existent TARGET dirs:
		@# they could be the result of a build failure and should NOT be
		@# included in the generated runlist.
		for TARGET in $(TARGETS); do \
		BUILD_TARGET=$$BUILD/$$TARGET; \
		[ ! -d $(INSTALL_PATH)/$$TARGET ] && echo "Skipping non-existent dir: $$TARGET" && continue; \
		echo "[ -w /dev/kmsg ] && echo \"kselftest: Running tests in $$TARGET\" >> /dev/kmsg" >> $(ALL_SCRIPT); \
		echo "cd $$TARGET" >> $(ALL_SCRIPT); \
		echo -n "run_many" >> $(ALL_SCRIPT); \
		echo -n "Emit Tests for $$TARGET\n"; \
		$(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET -C $$TARGET emit_tests >> $(ALL_SCRIPT); \
		echo "" >> $(ALL_SCRIPT); \
		echo "cd \$$ROOT" >> $(ALL_SCRIPT); \
		$(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET COLLECTION=$$TARGET \
		-C $$TARGET emit_tests >> $(TEST_LIST); \
		done;

		chmod u+x $(ALL_SCRIPT)
		else
		$(error Error: set INSTALL_PATH to use install)
		endif

tools/testing/selftests/lib.mk

+2 −3

Original line number	Diff line number	Diff line
		@@ -107,9 +107,8 @@ endif
		emit_tests:
		for TEST in $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_PROGS); do \
		BASENAME_TEST=`basename $$TEST`; \
		echo " \\"; \
		echo -n " \"$$BASENAME_TEST\""; \
		done; \
		echo "$(COLLECTION):$$BASENAME_TEST"; \
		done

		# define if isn't already. It is undefined in make O= case.
		ifeq ($(RM),)

tools/testing/selftests/run_kselftest.sh

0 → 100755

+28 −0

Original line number	Diff line number	Diff line
		#!/bin/sh
		# SPDX-License-Identifier: GPL-2.0
		#
		# Run installed kselftest tests.
		#
		BASE_DIR=$(realpath $(dirname $0))
		cd $BASE_DIR
		TESTS="$BASE_DIR"/kselftest-list.txt
		if [ ! -r "$TESTS" ] ; then
		echo "$0: Could not find list of tests to run ($TESTS)" >&2
		exit 1
		fi
		available="$(cat "$TESTS")"

		. ./kselftest/runner.sh
		ROOT=$PWD

		if [ "$1" = "--summary" ] ; then
		logfile="$BASE_DIR"/output.log
		cat /dev/null > $logfile
		fi

		collections=$(echo "$available" \| cut -d: -f1 \| uniq)
		for collection in $collections ; do
		[ -w /dev/kmsg ] && echo "kselftest: Running tests in $collection" >> /dev/kmsg
		tests=$(echo "$available" \| grep "^$collection:" \| cut -d: -f2)
		(cd "$collection" && run_many $tests)
		done

Admin message