Commit 7c079e90 authored by Laura Nao's avatar Laura Nao Committed by Shuah Khan
Browse files

selftests: Move KTAP bash helpers to selftests common folder 



Move bash helpers for outputting in KTAP format to the common selftests
folder. This allows kselftests other than the dt one to source the file
and make use of the helper functions.
Define pass, fail and skip codes in the same file too.

Signed-off-by: default avatarLaura Nao <laura.nao@collabora.com>
Reviewed-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Tested-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 8cbf22b3

tools/testing/selftests/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ 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 kselftest/ktap_helpers.sh $(INSTALL_PATH)/kselftest/

	install -m 744 run_kselftest.sh $(INSTALL_PATH)/

	rm -f $(TEST_LIST)

	@ret=1;	\

tools/testing/selftests/dt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ ifneq ($(PY3),) 


TEST_PROGS := test_unprobed_devices.sh

TEST_GEN_FILES := compatible_list

TEST_FILES := compatible_ignore_list ktap_helpers.sh

TEST_FILES := compatible_ignore_list



include ../lib.mk

tools/testing/selftests/dt/test_unprobed_devices.sh

+1 −5
Original line number Diff line number Diff line
@@ -15,16 +15,12 @@ 


DIR="$(dirname $(readlink -f "$0"))"



source "${DIR}"/ktap_helpers.sh

source "${DIR}"/../kselftest/ktap_helpers.sh



PDT=/proc/device-tree/

COMPAT_LIST="${DIR}"/compatible_list

IGNORE_LIST="${DIR}"/compatible_ignore_list



KSFT_PASS=0

KSFT_FAIL=1

KSFT_SKIP=4



ktap_print_header



if [[ ! -d "${PDT}" ]]; then

tools/testing/selftests/dt/ktap_helpers.sh→tools/testing/selftests/kselftest/ktap_helpers.sh

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,12 @@ KTAP_CNT_PASS=0 
KTAP_CNT_FAIL=0

KTAP_CNT_SKIP=0



KSFT_PASS=0

KSFT_FAIL=1

KSFT_XFAIL=2

KSFT_XPASS=3

KSFT_SKIP=4



ktap_print_header() {

	echo "TAP version 13"

}