From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Apr 2018 18:54:21 +0000 (-0700)
Subject: Merge tag 'linux-kselftest-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.17-rc1~88
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/fc22e19a114f000da4db2ed0ed82023c44d38a8c?hp=-c

Merge tag 'linux-kselftest-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest update from Shuah Khan:
 "This Kselftest update for 4.17-rc1 consists of:

   - Test build error fixes

   - Fixes to prevent intel_pstate from building on non-x86 systems.

   - New test for ion with vgem driver.

   - Change to print the test name to /dev/kmsg to add context to kernel
     failures if any uncovered from running the test.

   - Kselftest framework enhancements to add KSFT_TAP_LEVEL environment
     variable to prevent nested TAP headers being printed in the
     Kselftest output.

     Nested TAP13 headers could cause problems for some parsers. This
     change suppresses the nested headers from test programs and test
     shell scripts with changes to framework and Makefiles without
     changing the tests"

* tag 'linux-kselftest-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/intel_pstate: Fix build rule for x86
  selftests: Print the test we're running to /dev/kmsg
  selftests/seccomp: Allow get_metadata to XFAIL
  selftests/android/ion: Makefile: fix build error
  selftests: futex Makefile add top level TAP header echo to RUN_TESTS
  selftests: Makefile set KSFT_TAP_LEVEL to prevent nested TAP headers
  selftests: lib.mk set KSFT_TAP_LEVEL to prevent nested TAP headers
  selftests: kselftest framework: add handling for TAP header level
  selftests: ion: Add simple test with the vgem driver
  selftests: ion: Remove some prints
---

fc22e19a114f000da4db2ed0ed82023c44d38a8c
diff --combined tools/testing/selftests/Makefile
index dbda89c9d9b9,f4dfee6ea8a4..bae6a4e9f2ee
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@@ -7,7 -7,6 +7,7 @@@ TARGETS += cpufre
  TARGETS += cpu-hotplug
  TARGETS += efivarfs
  TARGETS += exec
 +TARGETS += filesystems
  TARGETS += firmware
  TARGETS += ftrace
  TARGETS += futex
@@@ -67,6 -66,12 +67,12 @@@ ifndef BUIL
    BUILD := $(shell pwd)
  endif
  
+ # KSFT_TAP_LEVEL is used from KSFT framework to prevent nested TAP header
+ # printing from tests. Applicable to run_tests case where run_tests adds
+ # TAP header prior running tests and when a test program invokes another
+ # with system() call. Export it here to cover override RUN_TESTS defines.
+ export KSFT_TAP_LEVEL=`echo 1`
+ 
  export BUILD
  all:
  	@for TARGET in $(TARGETS); do		\
@@@ -126,11 -131,14 +132,14 @@@ ifdef INSTALL_PAT
  	echo "else" >> $(ALL_SCRIPT)
  	echo "  OUTPUT=/dev/stdout" >> $(ALL_SCRIPT)
  	echo "fi" >> $(ALL_SCRIPT)
+ 	echo "export KSFT_TAP_LEVEL=`echo 1`" >> $(ALL_SCRIPT)
  
  	for TARGET in $(TARGETS); do \
  		BUILD_TARGET=$$BUILD/$$TARGET;	\
- 		echo "echo ; echo Running tests in $$TARGET" >> $(ALL_SCRIPT); \
+ 		echo "echo ; echo TAP version 13" >> $(ALL_SCRIPT);	\
+ 		echo "echo Running tests in $$TARGET" >> $(ALL_SCRIPT); \
  		echo "echo ========================================" >> $(ALL_SCRIPT); \
+ 		echo "[ -w /dev/kmsg ] && echo \"kselftest: Running tests in $$TARGET\" >> /dev/kmsg" >> $(ALL_SCRIPT); \
  		echo "cd $$TARGET" >> $(ALL_SCRIPT); \
  		make -s --no-print-directory OUTPUT=$$BUILD_TARGET -C $$TARGET emit_tests >> $(ALL_SCRIPT); \
  		echo "cd \$$ROOT" >> $(ALL_SCRIPT); \