1From 9b608d07ba3729bc7913619c1c0c2de70ec56cb5 Mon Sep 17 00:00:00 2001
2From: Steve Muckle <[email protected]>
3Date: Tue, 7 Nov 2017 16:01:53 -0800
4Subject: [PATCH 16/20] selftests/futex: report success/failure to environment
5
6Report whether or not any tests failed to the caller of the run.sh
7script.
8
9Skip tests when required syscall is not present.
10
11(cherry picked from commit 5c9ad29f58246b95fd5f1940e6b03ac485cc5168)
12Bug: 31590178
13Bug: 189333904
14Test: run vts-kernel -m VtsKernelLinuxKselftestStaging
15Signed-off-by: Steve Muckle <[email protected]>
16Signed-off-by: Edward Liaw <[email protected]>
17---
18 .../testing/selftests/futex/functional/run.sh | 70 +++++++++++--------
19 1 file changed, 41 insertions(+), 29 deletions(-)
20
21diff --git a/tools/testing/selftests/futex/functional/run.sh b/tools/testing/selftests/futex/functional/run.sh
22index 5ccd599da6c3..942dab5b5879 100755
23--- a/tools/testing/selftests/futex/functional/run.sh
24+++ b/tools/testing/selftests/futex/functional/run.sh
25@@ -18,6 +18,16 @@
26 #
27 ###############################################################################
28
29+run_test()
30+{
31+    $@
32+    ret=$?
33+    if [ $ret -ne 0 ] && [ $ret -ne 4 ]; then  # KSFT_SKIP=4
34+        echo "Failed with $ret"
35+        rc=1
36+    fi
37+}
38+
39 # Test for a color capable console
40 if [ -z "$USE_COLOR" ]; then
41     tput setf 7 || tput setaf 7
42@@ -34,51 +44,53 @@ fi
43 echo
44 # requeue pi testing
45 # without timeouts
46-./futex_requeue_pi $COLOR
47-./futex_requeue_pi $COLOR -b
48-./futex_requeue_pi $COLOR -b -l
49-./futex_requeue_pi $COLOR -b -o
50-./futex_requeue_pi $COLOR -l
51-./futex_requeue_pi $COLOR -o
52+run_test ./futex_requeue_pi $COLOR
53+run_test ./futex_requeue_pi $COLOR -b
54+run_test ./futex_requeue_pi $COLOR -b -l
55+run_test ./futex_requeue_pi $COLOR -b -o
56+run_test ./futex_requeue_pi $COLOR -l
57+run_test ./futex_requeue_pi $COLOR -o
58 # with timeouts
59-./futex_requeue_pi $COLOR -b -l -t 5000
60-./futex_requeue_pi $COLOR -l -t 5000
61-./futex_requeue_pi $COLOR -b -l -t 500000
62-./futex_requeue_pi $COLOR -l -t 500000
63-./futex_requeue_pi $COLOR -b -t 5000
64-./futex_requeue_pi $COLOR -t 5000
65-./futex_requeue_pi $COLOR -b -t 500000
66-./futex_requeue_pi $COLOR -t 500000
67-./futex_requeue_pi $COLOR -b -o -t 5000
68-./futex_requeue_pi $COLOR -l -t 5000
69-./futex_requeue_pi $COLOR -b -o -t 500000
70-./futex_requeue_pi $COLOR -l -t 500000
71+run_test ./futex_requeue_pi $COLOR -b -l -t 5000
72+run_test ./futex_requeue_pi $COLOR -l -t 5000
73+run_test ./futex_requeue_pi $COLOR -b -l -t 500000
74+run_test ./futex_requeue_pi $COLOR -l -t 500000
75+run_test ./futex_requeue_pi $COLOR -b -t 5000
76+run_test ./futex_requeue_pi $COLOR -t 5000
77+run_test ./futex_requeue_pi $COLOR -b -t 500000
78+run_test ./futex_requeue_pi $COLOR -t 500000
79+run_test ./futex_requeue_pi $COLOR -b -o -t 5000
80+run_test ./futex_requeue_pi $COLOR -l -t 5000
81+run_test ./futex_requeue_pi $COLOR -b -o -t 500000
82+run_test ./futex_requeue_pi $COLOR -l -t 500000
83 # with long timeout
84-./futex_requeue_pi $COLOR -b -l -t 2000000000
85-./futex_requeue_pi $COLOR -l -t 2000000000
86+run_test ./futex_requeue_pi $COLOR -b -l -t 2000000000
87+run_test ./futex_requeue_pi $COLOR -l -t 2000000000
88
89
90 echo
91-./futex_requeue_pi_mismatched_ops $COLOR
92+run_test ./futex_requeue_pi_mismatched_ops $COLOR
93
94 echo
95-./futex_requeue_pi_signal_restart $COLOR
96+run_test ./futex_requeue_pi_signal_restart $COLOR
97
98 echo
99-./futex_wait_timeout $COLOR
100+run_test ./futex_wait_timeout $COLOR
101
102 echo
103-./futex_wait_wouldblock $COLOR
104+run_test ./futex_wait_wouldblock $COLOR
105
106 echo
107-./futex_wait_uninitialized_heap $COLOR
108-./futex_wait_private_mapped_file $COLOR
109+run_test ./futex_wait_uninitialized_heap $COLOR
110+run_test ./futex_wait_private_mapped_file $COLOR
111
112 echo
113-./futex_wait $COLOR
114+run_test ./futex_wait $COLOR
115
116 echo
117-./futex_requeue $COLOR
118+run_test ./futex_requeue $COLOR
119
120 echo
121-./futex_waitv $COLOR
122+run_test ./futex_waitv $COLOR
123+
124+exit $rc
125--
1262.42.0.609.gbb76f46606-goog
127
128