[F][SRU][PATCH 1/2] Revert "UBUNTU: SAUCE: selftests/powerpc -- Disable timeout for benchmark and tm tests"
Po-Hsu Lin
po-hsu.lin at canonical.com
Mon Apr 6 05:57:44 UTC 2020
BugLink: https://bugs.launchpad.net/bugs/1864642
This reverts commit 6bd338f9bce51c049194539a2dc27a45808080c1.
---
tools/testing/selftests/powerpc/benchmarks/Makefile | 2 --
tools/testing/selftests/powerpc/benchmarks/settings | 1 -
tools/testing/selftests/powerpc/tm/Makefile | 2 --
tools/testing/selftests/powerpc/tm/settings | 1 -
4 files changed, 6 deletions(-)
delete mode 100644 tools/testing/selftests/powerpc/benchmarks/settings
delete mode 100644 tools/testing/selftests/powerpc/tm/settings
diff --git a/tools/testing/selftests/powerpc/benchmarks/Makefile b/tools/testing/selftests/powerpc/benchmarks/Makefile
index a32a6ab..d40300a 100644
--- a/tools/testing/selftests/powerpc/benchmarks/Makefile
+++ b/tools/testing/selftests/powerpc/benchmarks/Makefile
@@ -2,8 +2,6 @@
TEST_GEN_PROGS := gettimeofday context_switch fork mmap_bench futex_bench null_syscall
TEST_GEN_FILES := exec_target
-TEST_FILES := settings
-
CFLAGS += -O2
top_srcdir = ../../../../..
diff --git a/tools/testing/selftests/powerpc/benchmarks/settings b/tools/testing/selftests/powerpc/benchmarks/settings
deleted file mode 100644
index e7b9417..0000000
--- a/tools/testing/selftests/powerpc/benchmarks/settings
+++ /dev/null
@@ -1 +0,0 @@
-timeout=0
diff --git a/tools/testing/selftests/powerpc/tm/Makefile b/tools/testing/selftests/powerpc/tm/Makefile
index 7b99d09..b15a1a3 100644
--- a/tools/testing/selftests/powerpc/tm/Makefile
+++ b/tools/testing/selftests/powerpc/tm/Makefile
@@ -7,8 +7,6 @@ TEST_GEN_PROGS := tm-resched-dscr tm-syscall tm-signal-msr-resv tm-signal-stack
$(SIGNAL_CONTEXT_CHK_TESTS) tm-sigreturn tm-signal-sigreturn-nt \
tm-signal-context-force-tm tm-poison
-TEST_FILES := settings
-
top_srcdir = ../../../../..
include ../../lib.mk
diff --git a/tools/testing/selftests/powerpc/tm/settings b/tools/testing/selftests/powerpc/tm/settings
deleted file mode 100644
index e7b9417..0000000
--- a/tools/testing/selftests/powerpc/tm/settings
+++ /dev/null
@@ -1 +0,0 @@
-timeout=0
--
2.7.4
More information about the kernel-team
mailing list