4.13-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Shuah Khan <shua...@osg.samsung.com>

commit df9c011c0a23cf1399c01f896cd359d932ab49b5 upstream.

When a test exits with skip exit code of 4, "make run_destructive_tests"
halts testing. Fix run_destructive_tests target to handle error exit codes.

Reported-by: John Stultz <john.stu...@linaro.org>
Signed-off-by: Shuah Khan <shua...@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 tools/testing/selftests/timers/Makefile |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

--- a/tools/testing/selftests/timers/Makefile
+++ b/tools/testing/selftests/timers/Makefile
@@ -14,20 +14,20 @@ TEST_GEN_PROGS_EXTENDED = alarmtimer-sus
 
 include ../lib.mk
 
+define RUN_DESTRUCTIVE_TESTS
+       @for TEST in $(TEST_GEN_PROGS_EXTENDED); do \
+               BASENAME_TEST=`basename $$TEST`;        \
+               if [ ! -x $$BASENAME_TEST ]; then       \
+                       echo "selftests: Warning: file $$BASENAME_TEST is not 
executable, correct this.";\
+                       echo "selftests: $$BASENAME_TEST [FAIL]"; \
+               else                                    \
+                       cd `dirname $$TEST`; (./$$BASENAME_TEST && echo 
"selftests: $$BASENAME_TEST [PASS]") || echo "selftests:  $$BASENAME_TEST 
[FAIL]"; cd -;\
+               fi;                                     \
+       done;
+endef
+
 # these tests require escalated privileges
 # and may modify the system time or trigger
 # other behavior like suspend
 run_destructive_tests: run_tests
-       ./alarmtimer-suspend
-       ./valid-adjtimex
-       ./adjtick
-       ./change_skew
-       ./skew_consistency
-       ./clocksource-switch
-       ./freq-step
-       ./leap-a-day -s -i 10
-       ./leapcrash
-       ./set-tz
-       ./set-tai
-       ./set-2038
-
+       $(RUN_DESTRUCTIVE_TESTS)


Reply via email to