From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 May 2017 03:43:30 +0000 (-0700)
Subject: Merge tag 'linux-kselftest-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: MMI-PSA29.97-13-9~5647
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2868b2513aa732a99ea4a0a6bf10dc93c1f3dac2;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'linux-kselftest-4.12-rc1' of git://git./linux/kernel/git/shuah/linux-kselftest

Pull kselftest updates from Shuah Khan:
 "This update consists of:

   - important fixes for build failures and clean target related
     warnings to address regressions introduced in commit 88baa78d1f31
     ("selftests: remove duplicated all and clean target")

   - several minor spelling fixes in and log messages and comment
     blocks.

   - Enabling configs for better test coverage in ftrace, vm, and
     cpufreq tests.

   - .gitignore changes"

* tag 'linux-kselftest-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (26 commits)
  selftests: x86: add missing executables to .gitignore
  selftests: watchdog: accept multiple params on command line
  selftests: create cpufreq kconfig fragments
  selftests: x86: override clean in lib.mk to fix warnings
  selftests: sync: override clean in lib.mk to fix warnings
  selftests: splice: override clean in lib.mk to fix warnings
  selftests: gpio: fix clean target to remove all generated files and dirs
  selftests: add gpio generated files to .gitignore
  selftests: powerpc: override clean in lib.mk to fix warnings
  selftests: gpio: override clean in lib.mk to fix warnings
  selftests: futex: override clean in lib.mk to fix warnings
  selftests: lib.mk: define CLEAN macro to allow Makefiles to override clean
  selftests: splice: fix clean target to not remove default_file_splice_read.sh
  selftests: gpio: add config fragment for gpio-mockup
  selftests: breakpoints: allow to cross-compile for aarch64/arm64
  selftests/Makefile: Add missed PHONY targets
  selftests/vm/run_vmtests: Fix wrong comment
  selftests/Makefile: Add missed closing `"` in comment
  selftests/vm/run_vmtests: Polish output text
  selftests/timers: fix spelling mistake: "Asynchronous"
  ...
---

2868b2513aa732a99ea4a0a6bf10dc93c1f3dac2
diff --cc tools/testing/selftests/powerpc/Makefile
index 03e1617367d3,8d9fc64c8761..72c3ac2323e1
--- a/tools/testing/selftests/powerpc/Makefile
+++ b/tools/testing/selftests/powerpc/Makefile
@@@ -60,9 -59,9 +60,9 @@@ override define EMIT_TEST
  	done;
  endef
  
- clean:
+ override define CLEAN
  	@for TARGET in $(SUB_DIRS); do \
 -		BUILD_TARGET=$$OUTPUT/$$TARGET;	\
 +		BUILD_TARGET=$(OUTPUT)/$$TARGET;	\
  		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean; \
  	done;
  	rm -f tags
diff --cc tools/testing/selftests/vm/run_vmtests
index 0640923ded7e,2ed05ad00daa..07548a1fa901
--- a/tools/testing/selftests/vm/run_vmtests
+++ b/tools/testing/selftests/vm/run_vmtests
@@@ -92,10 -92,10 +92,10 @@@ echo "NOTE: The above hugetlb tests pro
  echo "      https://github.com/libhugetlbfs/libhugetlbfs.git for"
  echo "      hugetlb regression testing."
  
- echo "--------------------"
+ echo "-------------------"
  echo "running userfaultfd"
- echo "--------------------"
+ echo "-------------------"
 -./userfaultfd 128 32
 +./userfaultfd anon 128 32
  if [ $? -ne 0 ]; then
  	echo "[FAIL]"
  	exitcode=1
@@@ -103,11 -103,11 +103,11 @@@ els
  	echo "[PASS]"
  fi
  
- echo "----------------------------"
+ echo "---------------------------"
  echo "running userfaultfd_hugetlb"
- echo "----------------------------"
- # 258MB total huge pages == 128MB src and 128MB dst
+ echo "---------------------------"
+ # 256MB total huge pages == 128MB src and 128MB dst
 -./userfaultfd_hugetlb 128 32 $mnt/ufd_test_file
 +./userfaultfd hugetlb 128 32 $mnt/ufd_test_file
  if [ $? -ne 0 ]; then
  	echo "[FAIL]"
  	exitcode=1
@@@ -116,10 -116,10 +116,10 @@@ els
  fi
  rm -f $mnt/ufd_test_file
  
- echo "----------------------------"
+ echo "-------------------------"
  echo "running userfaultfd_shmem"
- echo "----------------------------"
+ echo "-------------------------"
 -./userfaultfd_shmem 128 32
 +./userfaultfd shmem 128 32
  if [ $? -ne 0 ]; then
  	echo "[FAIL]"
  	exitcode=1