[SRU][Q][PATCH v4 2/2] selftests/powerpc: Give all tests 2 minutes timeout

[Zixing Liu]

From: Michael Ellerman <mpe at ellerman.id.au>

BugLink: https://bugs.launchpad.net/bugs/2141536

Each of the powerpc selftests runs with a timeout of 2 minutes by
default (see tools/testing/selftests/powerpc/harness.c).

But when tests are run with run_kselftest.sh it uses a timeout of 45
seconds, meaning some tests run OK standalone but fail when run with the
test runner.

So tell run_kselftest.sh to give each test 130 seconds, that should
allow the tests to complete, or be killed by the powerpc test harness
after 2 minutes. If for some reason the harness fails, or for the few
tests that don't use the harness, the 130 second timeout should catch
them if they get stuck.

Signed-off-by: Michael Ellerman <mpe at ellerman.id.au>
(backported from commit 5543d595954eefb3a6faa18a6dc7b1b3d6022052)
Signed-off-by: Zixing Liu <zixing.liu at canonical.com>
---
 tools/testing/selftests/powerpc/alignment/settings       | 1 +
 tools/testing/selftests/powerpc/cache_shape/settings     | 1 +
 tools/testing/selftests/powerpc/copyloops/settings       | 1 +
 tools/testing/selftests/powerpc/dexcr/settings           | 1 +
 tools/testing/selftests/powerpc/dscr/settings            | 2 +-
 tools/testing/selftests/powerpc/lib/settings             | 1 +
 tools/testing/selftests/powerpc/math/settings            | 1 +
 tools/testing/selftests/powerpc/mce/settings             | 1 +
 tools/testing/selftests/powerpc/mm/settings              | 1 +
 tools/testing/selftests/powerpc/nx-gzip/settings         | 1 +
 tools/testing/selftests/powerpc/papr_attributes/settings | 1 +
 tools/testing/selftests/powerpc/papr_sysparm/settings    | 1 +
 tools/testing/selftests/powerpc/papr_vpd/settings        | 1 +
 tools/testing/selftests/powerpc/pmu/settings             | 1 +
 tools/testing/selftests/powerpc/primitives/settings      | 1 +
 tools/testing/selftests/powerpc/ptrace/settings          | 1 +
 tools/testing/selftests/powerpc/scripts/settings         | 1 +
 tools/testing/selftests/powerpc/security/settings        | 1 +
 tools/testing/selftests/powerpc/stringloops/settings     | 1 +
 tools/testing/selftests/powerpc/switch_endian/settings   | 1 +
 tools/testing/selftests/powerpc/syscalls/settings        | 1 +
 tools/testing/selftests/powerpc/vphn/settings            | 1 +
 22 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 tools/testing/selftests/powerpc/alignment/settings
 create mode 100644 tools/testing/selftests/powerpc/cache_shape/settings
 create mode 100644 tools/testing/selftests/powerpc/copyloops/settings
 create mode 100644 tools/testing/selftests/powerpc/dexcr/settings
 create mode 100644 tools/testing/selftests/powerpc/lib/settings
 create mode 100644 tools/testing/selftests/powerpc/math/settings
 create mode 100644 tools/testing/selftests/powerpc/mce/settings
 create mode 100644 tools/testing/selftests/powerpc/mm/settings
 create mode 100644 tools/testing/selftests/powerpc/nx-gzip/settings
 create mode 100644 tools/testing/selftests/powerpc/papr_attributes/settings
 create mode 100644 tools/testing/selftests/powerpc/papr_sysparm/settings
 create mode 100644 tools/testing/selftests/powerpc/papr_vpd/settings
 create mode 100644 tools/testing/selftests/powerpc/pmu/settings
 create mode 100644 tools/testing/selftests/powerpc/primitives/settings
 create mode 100644 tools/testing/selftests/powerpc/ptrace/settings
 create mode 100644 tools/testing/selftests/powerpc/scripts/settings
 create mode 100644 tools/testing/selftests/powerpc/security/settings
 create mode 100644 tools/testing/selftests/powerpc/stringloops/settings
 create mode 100644 tools/testing/selftests/powerpc/switch_endian/settings
 create mode 100644 tools/testing/selftests/powerpc/syscalls/settings
 create mode 100644 tools/testing/selftests/powerpc/vphn/settings

diff --git a/tools/testing/selftests/powerpc/alignment/settings b/tools/testing/selftests/powerpc/alignment/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/alignment/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/cache_shape/settings b/tools/testing/selftests/powerpc/cache_shape/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/cache_shape/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/copyloops/settings b/tools/testing/selftests/powerpc/copyloops/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/copyloops/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/dexcr/settings b/tools/testing/selftests/powerpc/dexcr/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/dexcr/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/dscr/settings b/tools/testing/selftests/powerpc/dscr/settings
index e7b9417537fb..2e8566183318 100644
--- a/tools/testing/selftests/powerpc/dscr/settings
+++ b/tools/testing/selftests/powerpc/dscr/settings
@@ -1 +1 @@
-timeout=0
+timeout=130
diff --git a/tools/testing/selftests/powerpc/lib/settings b/tools/testing/selftests/powerpc/lib/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/lib/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/math/settings b/tools/testing/selftests/powerpc/math/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/math/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/mce/settings b/tools/testing/selftests/powerpc/mce/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/mce/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/mm/settings b/tools/testing/selftests/powerpc/mm/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/mm/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/nx-gzip/settings b/tools/testing/selftests/powerpc/nx-gzip/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/nx-gzip/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/papr_attributes/settings b/tools/testing/selftests/powerpc/papr_attributes/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/papr_attributes/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/papr_sysparm/settings b/tools/testing/selftests/powerpc/papr_sysparm/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/papr_sysparm/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/papr_vpd/settings b/tools/testing/selftests/powerpc/papr_vpd/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/papr_vpd/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/pmu/settings b/tools/testing/selftests/powerpc/pmu/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/pmu/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/primitives/settings b/tools/testing/selftests/powerpc/primitives/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/primitives/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/ptrace/settings b/tools/testing/selftests/powerpc/ptrace/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/ptrace/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/scripts/settings b/tools/testing/selftests/powerpc/scripts/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/scripts/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/security/settings b/tools/testing/selftests/powerpc/security/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/security/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/stringloops/settings b/tools/testing/selftests/powerpc/stringloops/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/stringloops/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/switch_endian/settings b/tools/testing/selftests/powerpc/switch_endian/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/switch_endian/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/syscalls/settings b/tools/testing/selftests/powerpc/syscalls/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/syscalls/settings
@@ -0,0 +1 @@
+timeout=130
diff --git a/tools/testing/selftests/powerpc/vphn/settings b/tools/testing/selftests/powerpc/vphn/settings
new file mode 100644
index 000000000000..2e8566183318
--- /dev/null
+++ b/tools/testing/selftests/powerpc/vphn/settings
@@ -0,0 +1 @@
+timeout=130
-- 
2.53.0