diff --git a/tests/micropython/heapalloc.py b/tests/micropython/heapalloc.py index c19893a008d33641cb60b008a92f8f0ec7a9d52d..62f26df6afd8070fd99e40b70e8b4e2df88fc977 100644 --- a/tests/micropython/heapalloc.py +++ b/tests/micropython/heapalloc.py @@ -1,7 +1,6 @@ # check that we can do certain things without allocating heap memory import micropython -import sys def f1(a): print(a) @@ -18,13 +17,6 @@ def f3(a, b, c, d): global_var = 1 -# preallocate exception instance with some room for a traceback -global_exc = StopIteration() -try: - raise global_exc -except: - pass - def test(): global global_var, global_exc global_var = 2 # set an existing global variable @@ -36,13 +28,6 @@ def test(): f2(i, i) # 2 args f3(1, 2, 3, 4) # function with lots of local state - # test that we can generate a traceback without allocating - global_exc.__traceback__ = None - try: - raise global_exc - except StopIteration as e: - sys.print_exception(e) - # call test() with heap allocation disabled micropython.heap_lock() test() diff --git a/tests/micropython/heapalloc.py.exp b/tests/micropython/heapalloc.py.exp index 3d5825f5a64cb2a0d6c45afb049968df7c44d249..c8cffe183f074d22fdea783b91ea90e11d4db555 100644 --- a/tests/micropython/heapalloc.py.exp +++ b/tests/micropython/heapalloc.py.exp @@ -9,6 +9,3 @@ 1 2 1 1 1 2 3 4 10 -Traceback (most recent call last): - File "micropython/heapalloc.py", line 42, in test -StopIteration: diff --git a/tests/micropython/heapalloc_traceback.py b/tests/micropython/heapalloc_traceback.py new file mode 100644 index 0000000000000000000000000000000000000000..9f43da259202887eb03fb47f5c06f3e678d14ec9 --- /dev/null +++ b/tests/micropython/heapalloc_traceback.py @@ -0,0 +1,24 @@ +# test that we can generate a traceback without allocating + +import micropython +import sys + +# preallocate exception instance with some room for a traceback +global_exc = StopIteration() +try: + raise global_exc +except: + pass + +def test(): + global global_exc + global_exc.__traceback__ = None + try: + raise global_exc + except StopIteration as e: + sys.print_exception(e) + +# call test() with heap allocation disabled +micropython.heap_lock() +test() +micropython.heap_unlock() diff --git a/tests/micropython/heapalloc_traceback.py.exp b/tests/micropython/heapalloc_traceback.py.exp new file mode 100644 index 0000000000000000000000000000000000000000..16284f0da382a8aecde32ba810322ca20c599d24 --- /dev/null +++ b/tests/micropython/heapalloc_traceback.py.exp @@ -0,0 +1,3 @@ +Traceback (most recent call last): + File "micropython/heapalloc_traceback.py", line 17, in test +StopIteration: diff --git a/tests/run-tests b/tests/run-tests index 4ac7d8e28fd4c63f831212f3803b66a5d2d4b675..3898fb7aa7169857f315e79241d619e220a0bd79 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -291,6 +291,7 @@ def run_tests(pyb, tests, args): skip_tests.add('misc/rge_sm.py') # requires yield skip_tests.add('misc/print_exception.py') # because native doesn't have proper traceback info skip_tests.add('misc/sys_exc_info.py') # sys.exc_info() is not supported for native + skip_tests.add('micropython/heapalloc_traceback.py') # because native doesn't have proper traceback info for test_file in tests: test_file = test_file.replace('\\', '/')