summaryrefslogtreecommitdiff
path: root/automated
diff options
context:
space:
mode:
authorDan Rue <dan.rue@linaro.org>2017-11-07 14:55:58 -0600
committerMilosz Wasilewski <milosz.wasilewski@linaro.org>2017-11-09 21:54:44 +0000
commita7e86c48a1cafdc899b1f4eb9ba3a432aa44d654 (patch)
treee0823485590cdc1b09db04864443bba13070dc9c /automated
parentbcfd75c312635b0c646d17c90eb9487c5fa25905 (diff)
LTP: Stop systemd-timesyncd if running
systemd-timesyncd interferes with the leapsec_timer test. Disable it. Change-Id: I616b74d6ea4aa07ad973e548dfa7664c4b03f6e8 Signed-off-by: Dan Rue <dan.rue@linaro.org>
Diffstat (limited to 'automated')
-rwxr-xr-xautomated/linux/ltp/ltp.sh11
-rw-r--r--automated/linux/ltp/skipfile-rpk4
2 files changed, 11 insertions, 4 deletions
diff --git a/automated/linux/ltp/ltp.sh b/automated/linux/ltp/ltp.sh
index 4e8ca27..9cc4818 100755
--- a/automated/linux/ltp/ltp.sh
+++ b/automated/linux/ltp/ltp.sh
@@ -101,6 +101,15 @@ run_ltp() {
rm -rf "${LTP_TMPDIR}" || true
}
+# Prepare system
+prep_system() {
+ # Stop systemd-timesyncd if running
+ if systemctl is-active systemd-timesyncd 2>/dev/null; then
+ info_msg "Stopping systemd-timesyncd"
+ systemctl stop systemd-timesyncd
+ fi
+}
+
# Test run.
! check_root && error_msg "This script must be run as root"
create_out_dir "${OUTPUT}"
@@ -141,5 +150,7 @@ else
info_msg "Run install_ltp"
install_ltp
fi
+info_msg "Running prep_system"
+prep_system
info_msg "Running run_ltp"
run_ltp
diff --git a/automated/linux/ltp/skipfile-rpk b/automated/linux/ltp/skipfile-rpk
index 1d3bc97..cdde6a2 100644
--- a/automated/linux/ltp/skipfile-rpk
+++ b/automated/linux/ltp/skipfile-rpk
@@ -6,7 +6,3 @@ oom01 oom01
# These tests can cause a deadlock which prevents the remaining tests from
# running. Details at https://bugs.linaro.org/show_bug.cgi?id=3068
rwtest03 rwtest04
-
-# tests that fail because time syncing services are not turned off
-# https://bugs.linaro.org/show_bug.cgi?id=3335
-leapsec_timer leapsec_timer