From 4f1206c1c5574be55276f301bfbe5a8a9e342ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= <gaetan.harter@fu-berlin.de>
Date: Thu, 26 Apr 2018 15:27:29 +0200
Subject: [PATCH] tests/sizeof_tcb: fix test for 16bit wsn430
---
tests/sizeof_tcb/tests/01-run.py | 33 ++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/tests/sizeof_tcb/tests/01-run.py b/tests/sizeof_tcb/tests/01-run.py
index 6a480f50e9..a38b8ee232 100755
--- a/tests/sizeof_tcb/tests/01-run.py
+++ b/tests/sizeof_tcb/tests/01-run.py
@@ -12,16 +12,29 @@ import sys
def testfunc(child):
child.expect_exact('\tmember, sizeof, offsetof')
- child.expect(r'sizeof\(thread_t\): [36, 48]')
- child.expect_exact('\tsp 4 0')
- child.expect_exact('\tstatus 1 4')
- child.expect_exact('\tpriority 1 5')
- child.expect_exact('\tpid 2 6')
- child.expect_exact('\trq_entry 4 8')
- child.expect_exact('\twait_data 4 12')
- child.expect_exact('\tmsg_waiters 4 16')
- child.expect_exact('\tmsg_queue 12 20')
- child.expect_exact('\tmsg_array 4 32')
+ ret = child.expect([r'sizeof\(thread_t\): [36, 48]',
+ r'sizeof\(thread_t\): [20, 26]'])
+ if ret == 0:
+ child.expect_exact('\tsp 4 0')
+ child.expect_exact('\tstatus 1 4')
+ child.expect_exact('\tpriority 1 5')
+ child.expect_exact('\tpid 2 6')
+ child.expect_exact('\trq_entry 4 8')
+ child.expect_exact('\twait_data 4 12')
+ child.expect_exact('\tmsg_waiters 4 16')
+ child.expect_exact('\tmsg_queue 12 20')
+ child.expect_exact('\tmsg_array 4 32')
+ else:
+ # 16 bit platform (wsn430)
+ child.expect_exact('\tsp 2 0')
+ child.expect_exact('\tstatus 1 2')
+ child.expect_exact('\tpriority 1 3')
+ child.expect_exact('\tpid 2 4')
+ child.expect_exact('\trq_entry 2 6')
+ child.expect_exact('\twait_data 2 8')
+ child.expect_exact('\tmsg_waiters 2 10')
+ child.expect_exact('\tmsg_queue 6 12')
+ child.expect_exact('\tmsg_array 2 18')
child.expect_exact('SUCCESS')
--
GitLab