From 2193b4677d9ca4e29dd30d68bd8faebe6586e880 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Mon, 28 Sep 2015 09:39:47 +0200 Subject: cyclictest: Simplify startup (init) script --- tests/cyclictest/parse | 2 +- tests/cyclictest/root/overlay/sbin/lcpinit | 4 +--- 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\d+) Act: *(?P\d+) Avg: *(?P\d+) Max: *(?P\d+) ok") +result_re = re.compile("T: 0 \(.*\) P:.* I:.* C:.* Min: *(?P\d+) Act: *(?P\d+) Avg: *(?P\d+) Max: *(?P\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" -- cgit v1.2.3