riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12832 from aabadie/pr/tests/ps_schedstatistics_enh

Browse Source 
tests/ps_schedstatistics: fix test on AVR + improve Python test script
This commit is contained in:
Alexandre Abadie 2019-11-28 13:58:39 +01:00 committed by GitHub
commit f5252bf482
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/ps_schedstatistics/main.c
View File

@ -47,7 +47,7 @@ static void *_thread_fn(void *arg)
for (int i = 0; i < (10 * (next + 1)); ++i) { for (int i = 0; i < (10 * (next + 1)); ++i) {
_xtimer_now64(); _xtimer_now64();
} }
xtimer_usleep(XTIMER_BACKOFF * 3); xtimer_usleep(XTIMER_BACKOFF * 10);
msg_send(&m2, pids[next]); msg_send(&m2, pids[next]);
} }

24
tests/ps_schedstatistics/tests/01-run.py
View File

@ -10,25 +10,25 @@ import sys
from testrunner import run from testrunner import run
PS_EXPECTED = ( PS_EXPECTED = (
(r'\tpid | name | state Q | pri | stack ( used) | ' (r'\tpid | name | state Q | pri | stack \( used\) | '
r'base addr | current | runtime | switches'), r'base addr | current | runtime | switches'),
(r'\t - | isr_stack | - - | - | \d+ ( -?\d+) | ' (r'\t - | isr_stack | - - | - | \d+ \( -?\d+\) | '
r'0x\d+ | 0x\d+'), r'0x\d+ | 0x\d+'),
(r'\t 1 | idle | pending Q | 15 | \d+ ( -?\d+) | ' (r'\t 1 | idle | pending Q | 15 | \d+ \( -?\d+\) | '
r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'), r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'),
(r'\t 2 | main | running Q | 7 | \d+ ( -?\d+) | ' (r'\t 2 | main | running Q | 7 | \d+ \( -?\d+\) | '
r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'), r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'),
(r'\t 3 | thread | bl rx _ | 6 | \d+ ( -?\d+) | ' (r'\t 3 | thread | bl rx _ | 6 | \d+ \( -?\d+\) | '
r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'), r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'),
(r'\t 4 | thread | bl rx _ | 6 | \d+ ( -?\d+) | ' (r'\t 4 | thread | bl rx _ | 6 | \d+ \( -?\d+\) | '
r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'), r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'),
(r'\t 5 | thread | bl rx _ | 6 | \d+ ( -?\d+) | ' (r'\t 5 | thread | bl rx _ | 6 | \d+ \( -?\d+\) | '
r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'), r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'),
(r'\t 6 | thread | bl mutex _ | 6 | \d+ ( -?\d+) | ' (r'\t 6 | thread | bl mutex _ | 6 | \d+ \( -?\d+\) | '
r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'), r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'),
(r'\t 7 | thread | bl rx _ | 6 | \d+ ( -?\d+) | ' (r'\t 7 | thread | bl rx _ | 6 | \d+ \( -?\d+\) | '
r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'), r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'),
(r'\t | SUM | | | \d+ (\d+)') (r'\t | SUM | | | \d+ \(\d+\)')
) )
@ -40,7 +40,7 @@ def _check_startup(child):
def _check_help(child): def _check_help(child):
child.sendline('') child.sendline('')
child.expect('>') child.expect_exact('>')
child.sendline('help') child.sendline('help')
child.expect_exact('Command Description') child.expect_exact('Command Description')
child.expect_exact('---------------------------------------') child.expect_exact('---------------------------------------')
@ -53,6 +53,8 @@ def _check_ps(child):
child.sendline('ps') child.sendline('ps')
for line in PS_EXPECTED: for line in PS_EXPECTED:
child.expect(line) child.expect(line)
# Wait for all lines of the ps output to be displayed
child.expect_exact('>')
def testfunc(child): def testfunc(child):