leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

selftests: lib.mk: move running and printing result to a new function

Browse Source 
RUN_TESTS function has grown and becoming harder to maintain. Move
the code that runs and tests for returns codes to a new function
and call it from RUN_TESTS.

A new RUN_TEST_PRINT_RESULT is created to simplify RUN_TESTS and make it
easier to add handling for other return codes as needed.

Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
This commit is contained in:
Shuah Khan (Samsung OSG) 2018-04-25 09:32:20 -06:00
parent 3f4435b514
commit 7afed3dc36
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tools/testing/selftests/lib.mk
View File

@ -19,6 +19,33 @@ TEST_GEN_FILES := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_FILES))
all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)
.ONESHELL:
define RUN_TEST_PRINT_RESULT
echo "selftests: $$BASENAME_TEST"; \
echo "========================================"; \
if [ ! -x $$TEST ]; then \
echo "selftests: Warning: file $$BASENAME_TEST is not executable, correct this.";\
echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; \
else \
cd `dirname $$TEST` > /dev/null; \
if [ "X$(summary)" != "X" ]; then \
(./$$BASENAME_TEST > /tmp/$$BASENAME_TEST 2>&1 && \
echo "ok 1..$$test_num selftests: $$BASENAME_TEST [PASS]") || \
(if [ $$? -eq $$skip ]; then \
echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [SKIP]"; \
else echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; \
fi;) \
else \
(./$$BASENAME_TEST && \
echo "ok 1..$$test_num selftests: $$BASENAME_TEST [PASS]") || \
(if [ $$? -eq $$skip ]; then \
echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [SKIP]"; \
else echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; \
fi;) \
fi; \
cd - > /dev/null; \
fi;
endef
define RUN_TESTS
@export KSFT_TAP_LEVEL=`echo 1`; \
test_num=`echo 0`; \
@ -27,30 +54,7 @@ define RUN_TESTS
for TEST in $(1); do \
BASENAME_TEST=`basename $$TEST`; \
test_num=`echo $$test_num+1 | bc`; \
echo "selftests: $$BASENAME_TEST"; \
echo "========================================"; \
if [ ! -x $$TEST ]; then \
echo "selftests: Warning: file $$BASENAME_TEST is not executable, correct this.";\
echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; \
else \
cd `dirname $$TEST` > /dev/null; \
if [ "X$(summary)" != "X" ]; then \
(./$$BASENAME_TEST > /tmp/$$BASENAME_TEST 2>&1 && \
echo "ok 1..$$test_num selftests: $$BASENAME_TEST [PASS]") || \
(if [ $$? -eq $$skip ]; then \
echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [SKIP]"; \
else echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; \
fi;) \
else \
(./$$BASENAME_TEST && \
echo "ok 1..$$test_num selftests: $$BASENAME_TEST [PASS]") || \
(if [ $$? -eq $$skip ]; then \
echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [SKIP]"; \
else echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; \
fi;) \
fi; \
cd - > /dev/null; \
fi; \
$(call RUN_TEST_PRINT_RESULT,$(TEST),$(BASENAME_TEST),$(test_num),$(skip)) \
done;
endef