Commit 42d46e57 authored by Kees Cook's avatar Kees Cook Committed by Shuah Khan
Browse files

selftests: Extract single-test shell logic from lib.mk 



In order to improve the reusability of the kselftest test running logic,
this extracts the single-test logic from lib.mk into kselftest/runner.sh
which lib.mk can call directly. No changes in output.

As part of the change, this moves the "summary" Makefile logic around
to set a new "logfile" output. This will be used again in the future
"emit_tests" target as well.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent d917fb87

tools/testing/selftests/.gitignore

+0 −1
Original line number Original line Diff line number Diff line 
kselftest

gpiogpio-event-mon

gpiogpio-event-mon

gpiogpio-hammer

gpiogpio-hammer

gpioinclude/

gpioinclude/

tools/testing/selftests/kselftest/runner.sh

0 → 100644
+32 −0
Original line number Original line Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0

#

# Runs a set of tests in a given subdirectory.

export skip_rc=4

export logfile=/dev/stdout



run_one()

{

	TEST="$1"

	NUM="$2"



	BASENAME_TEST=$(basename $TEST)



	TEST_HDR_MSG="selftests: "`basename $PWD`:" $BASENAME_TEST"

	echo "$TEST_HDR_MSG"

	echo "========================================"

	if [ ! -x "$TEST" ]; then

		echo "$TEST_HDR_MSG: Warning: file $TEST is not executable, correct this."

		echo "not ok 1..$test_num $TEST_HDR_MSG [FAIL]"

	else

		cd `dirname $TEST` > /dev/null

		(./$BASENAME_TEST >> "$logfile" 2>&1 &&

		echo "ok 1..$test_num $TEST_HDR_MSG [PASS]") ||

		(if [ $? -eq $skip_rc ]; then	\

			echo "not ok 1..$test_num $TEST_HDR_MSG [SKIP]"

		else

			echo "not ok 1..$test_num $TEST_HDR_MSG [FAIL]"

		fi)

		cd - >/dev/null

	fi

}

tools/testing/selftests/lib.mk

+7 −30
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ ifeq (0,$(MAKELEVEL)) 
	endif

	endif

    endif

    endif

endif

endif

selfdir = $(realpath $(dir $(filter %/lib.mk,$(MAKEFILE_LIST))))





# The following are built by lib.mk common compile rules.

# The following are built by lib.mk common compile rules.

# TEST_CUSTOM_PROGS should be used by tests that require

# TEST_CUSTOM_PROGS should be used by tests that require
@@ -65,43 +66,19 @@ all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) 
endif

endif





.ONESHELL:

.ONESHELL:

define RUN_TEST_PRINT_RESULT

	TEST_HDR_MSG="selftests: "`basename $$PWD`:" $$BASENAME_TEST";	\

	echo $$TEST_HDR_MSG;					\

	echo "========================================";	\

	if [ ! -x $$TEST ]; then	\

		echo "$$TEST_HDR_MSG: Warning: file $$BASENAME_TEST is not executable, correct this.";\

		echo "not ok 1..$$test_num $$TEST_HDR_MSG [FAIL]"; \

	else					\

		cd `dirname $$TEST` > /dev/null; \

		if [ "X$(summary)" != "X" ]; then	\

			(./$$BASENAME_TEST > /tmp/$$BASENAME_TEST 2>&1 && \

			echo "ok 1..$$test_num $$TEST_HDR_MSG [PASS]") || \

			(if [ $$? -eq $$skip ]; then	\

				echo "not ok 1..$$test_num $$TEST_HDR_MSG [SKIP]";				\

			else echo "not ok 1..$$test_num $$TEST_HDR_MSG [FAIL]";					\

			fi;)			\

		else				\

			(./$$BASENAME_TEST &&	\

			echo "ok 1..$$test_num $$TEST_HDR_MSG [PASS]") ||						\

			(if [ $$? -eq $$skip ]; then \

				echo "not ok 1..$$test_num $$TEST_HDR_MSG [SKIP]"; \

			else echo "not ok 1..$$test_num $$TEST_HDR_MSG [FAIL]";				\

			fi;)		\

		fi;				\

		cd - > /dev/null;		\

	fi;

endef



define RUN_TESTS

define RUN_TESTS

	@export KSFT_TAP_LEVEL=`echo 1`;		\

	@export KSFT_TAP_LEVEL=`echo 1`;		\

	test_num=`echo 0`;				\

	test_num=`echo 0`;				\

	skip=`echo 4`;					\

	. $(selfdir)/kselftest/runner.sh;		\

	echo "TAP version 13";				\

	echo "TAP version 13";				\

	for TEST in $(1); do				\

	for TEST in $(1); do				\

		BASENAME_TEST=`basename $$TEST`;	\

		BASENAME_TEST=`basename $$TEST`;	\

		test_num=`echo $$test_num+1 | bc`;	\

		test_num=`echo $$test_num+1 | bc`;	\

		$(call RUN_TEST_PRINT_RESULT,$(TEST),$(BASENAME_TEST),$(test_num),$(skip))						\

		if [ "X$(summary)" != "X" ]; then	\

		        logfile="/tmp/$$BASENAME_TEST";	\

			cat /dev/null > "$$logfile";	\

		fi;					\

		run_one "$$BASENAME_TEST" "$$test_num";	\

	done;

	done;

endef

endef

CRA Git | Maintained and supported by SUSTech CRA and CCSE