nrf: Enable source line on tracebacks. Improve run-tests.

mzdaniel · mzdaniel · commit 790aa15999d7 · 2020-09-01T18:26:04.000-07:00
Improve traceback debugging on nrf targets with enough flash, adding missing source line info and improve run-tests to properly handle opt_level and opt_level_lineno tests.
diff --git a/ports/nrf/mpconfigdevice_nrf51822.h b/ports/nrf/mpconfigdevice_nrf51822.h
@@ -59,3 +59,11 @@
 #define MICROPY_PY_UBINASCII               (1)
 #endif
 #endif
+
+#ifndef MICROPY_ENABLE_SOURCE_LINE
+#if defined(BLUETOOTH_SD)
+#define MICROPY_ENABLE_SOURCE_LINE         (0)
+#else
+#define MICROPY_ENABLE_SOURCE_LINE         (1)
+#endif
+#endif
diff --git a/ports/nrf/mpconfigdevice_nrf52832.h b/ports/nrf/mpconfigdevice_nrf52832.h
@@ -47,3 +47,7 @@
 #ifndef MICROPY_PY_UBINASCII
 #define MICROPY_PY_UBINASCII               (1)
 #endif
+
+#ifndef MICROPY_ENABLE_SOURCE_LINE
+#define MICROPY_ENABLE_SOURCE_LINE         (1)
+#endif
diff --git a/ports/nrf/mpconfigdevice_nrf52840.h b/ports/nrf/mpconfigdevice_nrf52840.h
@@ -47,3 +47,7 @@
 #ifndef MICROPY_PY_UBINASCII
 #define MICROPY_PY_UBINASCII               (1)
 #endif
+
+#ifndef MICROPY_ENABLE_SOURCE_LINE
+#define MICROPY_ENABLE_SOURCE_LINE         (1)
+#endif
diff --git a/ports/nrf/mpconfigdevice_nrf9160.h b/ports/nrf/mpconfigdevice_nrf9160.h
@@ -47,3 +47,7 @@
 #ifndef MICROPY_PY_UBINASCII
 #define MICROPY_PY_UBINASCII               (1)
 #endif
+
+#ifndef MICROPY_ENABLE_SOURCE_LINE
+#define MICROPY_ENABLE_SOURCE_LINE         (1)
+#endif
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
@@ -60,7 +60,6 @@
 #define MICROPY_REPL_EMACS_KEYS     (0)
 #define MICROPY_REPL_AUTO_INDENT    (1)
 #define MICROPY_KBD_EXCEPTION       (1)
-#define MICROPY_ENABLE_SOURCE_LINE  (0)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #if NRF51
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_NONE)
diff --git a/tests/feature_check/lineno.py b/tests/feature_check/lineno.py
@@ -0,0 +1,5 @@
+try:
+    xyz
+except NameError as er:
+    import sys
+    sys.print_exception(er)
diff --git a/tests/feature_check/lineno.py.exp b/tests/feature_check/lineno.py.exp
diff --git a/tests/run-tests b/tests/run-tests
@@ -405,7 +405,9 @@ def run_tests(pyb, tests, args, result_dir):
         elif args.target == 'nrf':
             skip_tests.add('basics/memoryview1.py')         # no item assignment for memoryview
             skip_tests.add('extmod/urandom_basic.py')       # unimplemented: urandom.seed
-            skip_tests.add('micropython/opt_level.py')      # no support for line numbers
+            if b'line' not in run_feature_check(pyb, args, base_path, 'lineno.py'):
+                skip_tests.add('micropython/opt_level.py')  # no support for line numbers
+                skip_tests.add('micropython/opt_level_lineno.py')
             skip_tests.add('misc/non_compliant.py')         # no item assignment for bytearray
             for t in tests:
                 if t.startswith('basics/io_'):
