aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Sojka <sojkam1@fel.cvut.cz>2015-09-28 09:39:47 +0200
committerMichal Sojka <sojkam1@fel.cvut.cz>2015-09-28 09:39:47 +0200
commit2193b4677d9ca4e29dd30d68bd8faebe6586e880 (patch)
tree486f949ed69ea20cb81bb8c5495bf3930626a1b8
parent8c65cf30f0ebe1db262dce38bc314d111bc1dd8a (diff)
downloadlinux-conf-perf-2193b4677d9ca4e29dd30d68bd8faebe6586e880.tar.gz
linux-conf-perf-2193b4677d9ca4e29dd30d68bd8faebe6586e880.tar.bz2
linux-conf-perf-2193b4677d9ca4e29dd30d68bd8faebe6586e880.zip
cyclictest: Simplify startup (init) script
-rwxr-xr-xtests/cyclictest/parse2
-rwxr-xr-xtests/cyclictest/root/overlay/sbin/lcpinit4
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/cyclictest/parse b/tests/cyclictest/parse
index 75f29b8..3ea019e 100755
--- a/tests/cyclictest/parse
+++ b/tests/cyclictest/parse
@@ -2,7 +2,7 @@
import re
import fileinput
-result_re = re.compile("! T: 0 \(.*\) P:.* I:.* C:.* Min: *(?P<min>\d+) Act: *(?P<act>\d+) Avg: *(?P<avg>\d+) Max: *(?P<max>\d+) ok")
+result_re = re.compile("T: 0 \(.*\) P:.* I:.* C:.* Min: *(?P<min>\d+) Act: *(?P<act>\d+) Avg: *(?P<avg>\d+) Max: *(?P<max>\d+)")
for line in fileinput.input():
match = result_re.match(line)
diff --git a/tests/cyclictest/root/overlay/sbin/lcpinit b/tests/cyclictest/root/overlay/sbin/lcpinit
index 15cc11c..ae3980a 100755
--- a/tests/cyclictest/root/overlay/sbin/lcpinit
+++ b/tests/cyclictest/root/overlay/sbin/lcpinit
@@ -2,9 +2,7 @@
/bin/mount -t devtmpfs devtmpfs /dev
-echo Command: cyclictest -n -p99 -t3 -l10000 -q
echo Version: `cyclictest --help | head -1`
-echo
-cyclictest -n -p99 -t3 -l10000 -q | sed 's/^/! /' | sed 's/$/ ok/'
+(set -x; cyclictest -n -p99 -t3 -l10000 -q --priospread)
echo "NOVABOOT EXIT LINUX-CONF-PERF"