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

Pull Kselftest updates from Shuah Khan:
 "This update for Kselftest adds:

   - A new feature to create test-specific kconfig fragments.  This
     feature helps configure Kselftests to test specific Kernel
     Configuration options as opposed to defconfig.

   - A new test for Media Controller API

   - A few fixes"

* tag 'linux-kselftest-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: media_dcevice_test fix usage information
  selftests: media_dcevice_test fix to handle ioctl failure case
  selftests: add missing .gitignore file or entry
  Makefile: add kselftest-merge
  selftests: create test-specific kconfig fragments
  selftests: breakpoint: add step_after_suspend_test
  selftests: add a new test for Media Controller API

21 files changed, 362 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 7b3ecdcdc6c1..6798c6b4775d 100644
--- a/Makefile
+++ b/Makefile
@@ -1087,6 +1087,14 @@ kselftest:
 kselftest-clean:
         $(Q)$(MAKE) -C tools/testing/selftests clean
 
+PHONY += kselftest-merge
+kselftest-merge:
+        $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!))
+        $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
+                -m $(objtree)/.config \
+                $(srctree)/tools/testing/selftests/*/config
+        +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
+
 # ---------------------------------------------------------------------------
 # Modules
 
@@ -1295,6 +1303,8 @@ help:
         @echo  '                    Build, install, and boot kernel before'
         @echo  '                    running kselftest on it'
         @echo  '  kselftest-clean - Remove all generated kselftest files'
+        @echo  '  kselftest-merge - Merge all the config dependencies of kselftest to existed'
+        @echo  '                    .config.'
         @echo  ''
         @echo  'Kernel packaging:'
         @$(MAKE) $(build)=$(package-dir) help
diff --git a/tools/testing/selftests/breakpoints/.gitignore b/tools/testing/selftests/breakpoints/.gitignore
index 9b3193d06608..a23bb4a6f06c 100644
--- a/tools/testing/selftests/breakpoints/.gitignore
+++ b/tools/testing/selftests/breakpoints/.gitignore
@@ -1 +1,2 @@
 breakpoint_test
+step_after_suspend_test
diff --git a/tools/testing/selftests/breakpoints/Makefile b/tools/testing/selftests/breakpoints/Makefile
index c0d957015f52..74e533fd4bc5 100644
--- a/tools/testing/selftests/breakpoints/Makefile
+++ b/tools/testing/selftests/breakpoints/Makefile
@@ -6,9 +6,11 @@ ifeq ($(ARCH),x86)
 TEST_PROGS := breakpoint_test
 endif
 
+TEST_PROGS += step_after_suspend_test
+
 all: $(TEST_PROGS)
 
 include ../lib.mk
 
 clean:
-        rm -fr breakpoint_test
+        rm -fr breakpoint_test step_after_suspend_test
diff --git a/tools/testing/selftests/breakpoints/step_after_suspend_test.c b/tools/testing/selftests/breakpoints/step_after_suspend_test.c
new file mode 100644
index 000000000000..60b8a95dac26
--- /dev/null
+++ b/tools/testing/selftests/breakpoints/step_after_suspend_test.c
@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2016 Google, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#define _GNU_SOURCE
+
+#include <errno.h>
+#include <fcntl.h>
+#include <sched.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/ptrace.h>
+#include <sys/stat.h>
+#include <sys/timerfd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include "../kselftest.h"
+
+void child(int cpu)
+{
+        cpu_set_t set;
+
+        CPU_ZERO(&set);
+        CPU_SET(cpu, &set);
+        if (sched_setaffinity(0, sizeof(set), &set) != 0) {
+                perror("sched_setaffinity() failed");
+                _exit(1);
+        }
+
+        if (ptrace(PTRACE_TRACEME, 0, NULL, NULL) != 0) {
+                perror("ptrace(PTRACE_TRACEME) failed");
+                _exit(1);
+        }
+
+        if (raise(SIGSTOP) != 0) {
+                perror("raise(SIGSTOP) failed");
+                _exit(1);
+        }
+
+        _exit(0);
+}
+
+bool run_test(int cpu)
+{
+        int status;
+        pid_t pid = fork();
+        pid_t wpid;
+
+        if (pid < 0) {
+                perror("fork() failed");
+                return false;
+        }
+        if (pid == 0)
+                child(cpu);
+
+        wpid = waitpid(pid, &status, __WALL);
+        if (wpid != pid) {
+                perror("waitpid() failed");
+                return false;
+        }
+        if (!WIFSTOPPED(status)) {
+                printf("child did not stop\n");
+                return false;
+        }
+        if (WSTOPSIG(status) != SIGSTOP) {
+                printf("child did not stop with SIGSTOP\n");
+                return false;
+        }
+
+        if (ptrace(PTRACE_SINGLESTEP, pid, NULL, NULL) < 0) {
+                if (errno == EIO) {
+                        printf("ptrace(PTRACE_SINGLESTEP) not supported on this architecture\n");
+                        ksft_exit_skip();
+                }
+                perror("ptrace(PTRACE_SINGLESTEP) failed");
+                return false;
+        }
+
+        wpid = waitpid(pid, &status, __WALL);
+        if (wpid != pid) {
+                perror("waitpid() failed");
+                return false;
+        }
+        if (WIFEXITED(status)) {
+                printf("child did not single-step\n");
+                return false;
+        }
+        if (!WIFSTOPPED(status)) {
+                printf("child did not stop\n");
+                return false;
+        }
+        if (WSTOPSIG(status) != SIGTRAP) {
+                printf("child did not stop with SIGTRAP\n");