aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@kernel.org>2015-05-11 18:11:35 -0400
committerShuah Khan <shuahkh@osg.samsung.com>2015-05-12 22:02:22 -0400
commitc1e6e5cb941b54c2e7e84d9a796c1ad8377f44da (patch)
tree85508fe58ea42045ba95a1caa545e127192cf927 /tools/testing
parent07620abec867209a02aa51c424dbd35980480438 (diff)
selftests, x86: Remove useless run_tests rule
Now that selftests/x86 uses the kselftest infrastructure, the run_x86_tests.sh mechanism is just in the way. Signed-off-by: Andy Lutomirski <luto@kernel.org> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Diffstat (limited to 'tools/testing')
-rw-r--r--tools/testing/selftests/x86/Makefile7
-rw-r--r--tools/testing/selftests/x86/run_x86_tests.sh13
2 files changed, 2 insertions, 18 deletions
diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile
index 4af1e487354b..fe635399a3a6 100644
--- a/tools/testing/selftests/x86/Makefile
+++ b/tools/testing/selftests/x86/Makefile
@@ -1,4 +1,4 @@
1.PHONY: all all_32 all_64 check_build32 clean run_tests 1.PHONY: all all_32 all_64 check_build32 clean
2 2
3TARGETS_C_BOTHBITS := sigreturn single_step_syscall 3TARGETS_C_BOTHBITS := sigreturn single_step_syscall
4 4
@@ -15,7 +15,7 @@ ifeq ($(CROSS_COMPILE),)
15# Always build 32-bit tests 15# Always build 32-bit tests
16all: all_32 16all: all_32
17# Install 32-bit tests 17# Install 32-bit tests
18TEST_PROGS += $(BINARIES_32) run_x86_tests.sh 18TEST_PROGS += $(BINARIES_32)
19# If we're on a 64-bit host, build 64-bit tests as well 19# If we're on a 64-bit host, build 64-bit tests as well
20ifeq ($(UNAME_M),x86_64) 20ifeq ($(UNAME_M),x86_64)
21all: all_64 21all: all_64
@@ -33,9 +33,6 @@ include ../lib.mk
33clean: 33clean:
34 $(RM) $(BINARIES_32) $(BINARIES_64) 34 $(RM) $(BINARIES_32) $(BINARIES_64)
35 35
36run_tests:
37 ./run_x86_tests.sh
38
39$(TARGETS_C_BOTHBITS:%=%_32): %_32: %.c 36$(TARGETS_C_BOTHBITS:%=%_32): %_32: %.c
40 $(CC) -m32 -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $^ -lrt -ldl 37 $(CC) -m32 -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $^ -lrt -ldl
41 38
diff --git a/tools/testing/selftests/x86/run_x86_tests.sh b/tools/testing/selftests/x86/run_x86_tests.sh
deleted file mode 100644
index 3fc19b376812..000000000000
--- a/tools/testing/selftests/x86/run_x86_tests.sh
+++ /dev/null
@@ -1,13 +0,0 @@
1#!/bin/bash
2
3# This is deliberately minimal. IMO kselftests should provide a standard
4# script here.
5./sigreturn_32 || exit 1
6./single_step_syscall_32 || exit 1
7
8if [[ "$uname -p" -eq "x86_64" ]]; then
9 ./sigreturn_64 || exit 1
10 ./single_step_syscall_64 || exit 1
11fi
12
13exit 0