aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests
diff options
context:
space:
mode:
authorShuah Khan (Samsung OSG) <shuah@kernel.org>2018-04-24 14:57:36 -0600
committerShuah Khan (Samsung OSG) <shuah@kernel.org>2018-05-30 15:21:51 -0600
commit3f4435b5149372b3bbc5acab5c835d490490d6bc (patch)
tree9c74628cb719cc8ae3f59459648b48a015d6b07d /tools/testing/selftests
parentselftests: lib.mk: cleanup RUN_TESTS define and make it readable (diff)
downloadlinux-dev-3f4435b5149372b3bbc5acab5c835d490490d6bc.tar.xz
linux-dev-3f4435b5149372b3bbc5acab5c835d490490d6bc.zip
selftests: lib.mk: add SKIP handling to RUN_TESTS define
RUN_TESTS which is the common function that implements run_tests target, treats all non-zero return codes from tests as failures. When tests are skipped with non-zero return code, because of unmet dependencies and/or unsupported configuration, it reports them as failed. This will lead to too many false negatives even on the tests that couldn't be run. RUN_TESTS is changed to test for SKIP=4 return from tests to enable the framework for individual tests to return special SKIP code. Tests will be changed as needed to report SKIP instead FAIL/PASS when they get skipped. Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
Diffstat (limited to 'tools/testing/selftests')
-rw-r--r--tools/testing/selftests/lib.mk15
1 files changed, 13 insertions, 2 deletions
diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
index 1d2b48f2d481..e8f5f8b3abeb 100644
--- a/tools/testing/selftests/lib.mk
+++ b/tools/testing/selftests/lib.mk
@@ -22,6 +22,7 @@ all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)
define RUN_TESTS
@export KSFT_TAP_LEVEL=`echo 1`; \
test_num=`echo 0`; \
+ skip=`echo 4`; \
echo "TAP version 13"; \
for TEST in $(1); do \
BASENAME_TEST=`basename $$TEST`; \
@@ -34,9 +35,19 @@ define RUN_TESTS
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]") || echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; \
+ (./$$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]") || echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; \
+ (./$$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; \