summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShuah Khan <shuahkh@osg.samsung.com>2016-09-13 11:30:03 -0600
committerShuah Khan <shuahkh@osg.samsung.com>2016-09-20 09:54:38 -0600
commit8dbbf854202610a033a0788c33d8feb1548d3eeb (patch)
tree798c50901e2d723c2d1f4a788c93f91d2a2e0232
parent92dd8dd4d07f170db0638a20a8db691262da4e5e (diff)
selftests: move ptp tests from Documentation/ptp
Remove ptp from Makefile to move the test to selftests. Update ptp Makefile to work under selftests. ptp 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/Makefile2
-rw-r--r--Documentation/ptp/Makefile8
-rw-r--r--tools/testing/selftests/ptp/.gitignore (renamed from Documentation/ptp/.gitignore)0
-rw-r--r--tools/testing/selftests/ptp/Makefile8
-rw-r--r--tools/testing/selftests/ptp/testptp.c (renamed from Documentation/ptp/testptp.c)0
-rw-r--r--tools/testing/selftests/ptp/testptp.mk (renamed from Documentation/ptp/testptp.mk)0
6 files changed, 9 insertions, 9 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 7a28f6c26755..8cd6d1aaabfa 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,3 +1,3 @@
subdir-y := accounting auxdisplay blackfin \
ia64 laptops mic misc-devices \
- networking pcmcia ptp timers vDSO watchdog
+ networking pcmcia timers vDSO watchdog
diff --git a/Documentation/ptp/Makefile b/Documentation/ptp/Makefile
deleted file mode 100644
index 293d6c09a11f..000000000000
--- a/Documentation/ptp/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# List of programs to build
-hostprogs-y := testptp
-
-# Tell kbuild to always build the programs
-always := $(hostprogs-y)
-
-HOSTCFLAGS_testptp.o += -I$(objtree)/usr/include
-HOSTLOADLIBES_testptp := -lrt
diff --git a/Documentation/ptp/.gitignore b/tools/testing/selftests/ptp/.gitignore
index f562e49d6917..f562e49d6917 100644
--- a/Documentation/ptp/.gitignore
+++ b/tools/testing/selftests/ptp/.gitignore
diff --git a/tools/testing/selftests/ptp/Makefile b/tools/testing/selftests/ptp/Makefile
new file mode 100644
index 000000000000..83dd42b2129e
--- /dev/null
+++ b/tools/testing/selftests/ptp/Makefile
@@ -0,0 +1,8 @@
+TEST_PROGS := testptp
+LDLIBS += -lrt
+all: $(TEST_PROGS)
+
+include ../lib.mk
+
+clean:
+ rm -fr $(TEST_PROGS)
diff --git a/Documentation/ptp/testptp.c b/tools/testing/selftests/ptp/testptp.c
index 5d2eae16f7ee..5d2eae16f7ee 100644
--- a/Documentation/ptp/testptp.c
+++ b/tools/testing/selftests/ptp/testptp.c
diff --git a/Documentation/ptp/testptp.mk b/tools/testing/selftests/ptp/testptp.mk
index 4ef2d9755421..4ef2d9755421 100644
--- a/Documentation/ptp/testptp.mk
+++ b/tools/testing/selftests/ptp/testptp.mk