diff options
author | Shuah Khan <shuahkh@osg.samsung.com> | 2016-09-13 11:13:46 -0600 |
---|---|---|
committer | Shuah Khan <shuahkh@osg.samsung.com> | 2016-09-20 09:09:09 -0600 |
commit | 92dd8dd4d07f170db0638a20a8db691262da4e5e (patch) | |
tree | ef723c0dd5316e51b5e894b9fff7935515f98edd | |
parent | 10924bc6448760b355492f05ea414a65d924a72c (diff) |
selftests: move prctl tests from Documentation/prctl
Move prctl tests from Documentation/prctl to selftests/prctl.
Remove prctl from Makefile to move the test. Update prctl Makefile to work
under selftests. prctl will not be run as part of selftests suite and will
not be included in install targets. They can be built separately for now.
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
-rw-r--r-- | Documentation/Makefile | 2 | ||||
-rw-r--r-- | Documentation/prctl/Makefile | 10 | ||||
-rw-r--r-- | tools/testing/selftests/prctl/.gitignore (renamed from Documentation/prctl/.gitignore) | 0 | ||||
-rw-r--r-- | tools/testing/selftests/prctl/Makefile | 15 | ||||
-rw-r--r-- | tools/testing/selftests/prctl/disable-tsc-ctxt-sw-stress-test.c (renamed from Documentation/prctl/disable-tsc-ctxt-sw-stress-test.c) | 0 | ||||
-rw-r--r-- | tools/testing/selftests/prctl/disable-tsc-on-off-stress-test.c (renamed from Documentation/prctl/disable-tsc-on-off-stress-test.c) | 0 | ||||
-rw-r--r-- | tools/testing/selftests/prctl/disable-tsc-test.c (renamed from Documentation/prctl/disable-tsc-test.c) | 0 |
7 files changed, 16 insertions, 11 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 0473710c09d0..7a28f6c26755 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,3 +1,3 @@ subdir-y := accounting auxdisplay blackfin \ ia64 laptops mic misc-devices \ - networking pcmcia prctl ptp timers vDSO watchdog + networking pcmcia ptp timers vDSO watchdog diff --git a/Documentation/prctl/Makefile b/Documentation/prctl/Makefile deleted file mode 100644 index 44de3080c7f2..000000000000 --- a/Documentation/prctl/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -ifndef CROSS_COMPILE -# List of programs to build -hostprogs-$(CONFIG_X86) := disable-tsc-ctxt-sw-stress-test disable-tsc-on-off-stress-test disable-tsc-test -# Tell kbuild to always build the programs -always := $(hostprogs-y) - -HOSTCFLAGS_disable-tsc-ctxt-sw-stress-test.o += -I$(objtree)/usr/include -HOSTCFLAGS_disable-tsc-on-off-stress-test.o += -I$(objtree)/usr/include -HOSTCFLAGS_disable-tsc-test.o += -I$(objtree)/usr/include -endif diff --git a/Documentation/prctl/.gitignore b/tools/testing/selftests/prctl/.gitignore index 0b5c27447bf6..0b5c27447bf6 100644 --- a/Documentation/prctl/.gitignore +++ b/tools/testing/selftests/prctl/.gitignore diff --git a/tools/testing/selftests/prctl/Makefile b/tools/testing/selftests/prctl/Makefile new file mode 100644 index 000000000000..35aa1c8f2df2 --- /dev/null +++ b/tools/testing/selftests/prctl/Makefile @@ -0,0 +1,15 @@ +ifndef CROSS_COMPILE +uname_M := $(shell uname -m 2>/dev/null || echo not) +ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) + +ifeq ($(ARCH),x86) +TEST_PROGS := disable-tsc-ctxt-sw-stress-test disable-tsc-on-off-stress-test \ + disable-tsc-test +all: $(TEST_PROGS) + +include ../lib.mk + +clean: + rm -fr $(TEST_PROGS) +endif +endif diff --git a/Documentation/prctl/disable-tsc-ctxt-sw-stress-test.c b/tools/testing/selftests/prctl/disable-tsc-ctxt-sw-stress-test.c index f7499d1c0415..f7499d1c0415 100644 --- a/Documentation/prctl/disable-tsc-ctxt-sw-stress-test.c +++ b/tools/testing/selftests/prctl/disable-tsc-ctxt-sw-stress-test.c diff --git a/Documentation/prctl/disable-tsc-on-off-stress-test.c b/tools/testing/selftests/prctl/disable-tsc-on-off-stress-test.c index a06f027e9d16..a06f027e9d16 100644 --- a/Documentation/prctl/disable-tsc-on-off-stress-test.c +++ b/tools/testing/selftests/prctl/disable-tsc-on-off-stress-test.c diff --git a/Documentation/prctl/disable-tsc-test.c b/tools/testing/selftests/prctl/disable-tsc-test.c index 8d494f7bebdb..8d494f7bebdb 100644 --- a/Documentation/prctl/disable-tsc-test.c +++ b/tools/testing/selftests/prctl/disable-tsc-test.c |