diff options
| author | Glenn Ruben Bakke <glennbakke@gmail.com> | 2017-02-07 22:27:32 +0100 |
|---|---|---|
| committer | Glenn Ruben Bakke <glennbakke@gmail.com> | 2017-02-07 22:27:32 +0100 |
| commit | 122d0430db4d103dfb8bc9958b7df4d9803038c8 (patch) | |
| tree | 856ac0d4950b0154cc6aae8cf022fd29b2402073 /tests/thread | |
| parent | 723943abde3e9de5e14ee40df5e0d5fe25352c97 (diff) | |
| parent | 4cf7fd151e98a3d842eb5c9428545cb67ddd57ee (diff) | |
Merge branch 'nrf52' into nrf5_no_sdk
Diffstat (limited to 'tests/thread')
| -rw-r--r-- | tests/thread/thread_exc2.py.exp | 2 | ||||
| -rw-r--r-- | tests/thread/thread_stacksize1.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/thread/thread_exc2.py.exp b/tests/thread/thread_exc2.py.exp index 584bfab4d..cc7a20aa2 100644 --- a/tests/thread/thread_exc2.py.exp +++ b/tests/thread/thread_exc2.py.exp @@ -1,5 +1,5 @@ Unhandled exception in thread started by <function thread_entry at 0x\[0-9a-f\]\+> Traceback (most recent call last): - File "thread/thread_exc2.py", line 6, in thread_entry + File \.\+, line 6, in thread_entry ValueError: done diff --git a/tests/thread/thread_stacksize1.py b/tests/thread/thread_stacksize1.py index e62899631..62b6e5e40 100644 --- a/tests/thread/thread_stacksize1.py +++ b/tests/thread/thread_stacksize1.py @@ -38,6 +38,9 @@ _thread.stack_size(sz) for i in range(n_thread): _thread.start_new_thread(thread_entry, ()) +# reset stack size to default (for subsequent scripts on baremetal) +_thread.stack_size() + # busy wait for threads to finish while n_finished < n_thread: pass |
