proposal: run-multitests.py --target-wiring

ports/esp32/modules/machine.py

@@ -189,4 +189,7 @@ def phases(self):
 
 # Delegate to built-in machine module.
 def __getattr__(attr):
-    return getattr(_machine, attr)
+    value = getattr(_machine, attr, None)
+    if value is None:
+        raise ImportError(attr)
+    return value

ports/esp8266/boards/ESP8266_GENERIC/manifest_512kiB.py

@@ -1,9 +1,10 @@
 module("_boot.py", opt=3)
-module("apa102.py", base_path="$(PORT_DIR)/modules", opt=3)
-module("port_diag.py", base_path="$(PORT_DIR)/modules", opt=3)
-require("ntptime")
-require("dht")
-require("onewire")
-require("ds18x20")
-require("webrepl")
-require("neopixel")
+# module("apa102.py", base_path="$(PORT_DIR)/modules", opt=3)
+# module("port_diag.py", base_path="$(PORT_DIR)/modules", opt=3)
+# require("ntptime")
+# require("dht")
+# require("onewire")
+# require("ds18x20")
+# require("webrepl")
+# require("neopixel")
+require("unittest")

py/objlist.c

@@ -229,8 +229,10 @@ mp_obj_t mp_obj_list_append(mp_obj_t self_in, mp_obj_t arg) {
     mp_check_self(mp_obj_is_type(self_in, &mp_type_list));
     mp_obj_list_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->len >= self->alloc) {
-        self->items = m_renew(mp_obj_t, self->items, self->alloc, self->alloc * 2);
-        self->alloc *= 2;
+        // Progression: 4 8 12 20 32 48 72 108 164 248 372 ...
+        size_t new_alloc = (self->alloc + self->alloc / 2 + 3) & ~3;
+        self->items = m_renew(mp_obj_t, self->items, self->alloc, new_alloc);
+        self->alloc = new_alloc;
         mp_seq_clear(self->items, self->len + 1, self->alloc, sizeof(*self->items));
     }
     self->items[self->len++] = arg;

py/persistentcode.h

@@ -54,9 +54,9 @@
     #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_X64)
 #elif MICROPY_EMIT_THUMB
     #if defined(__thumb2__)
-        #if defined(__ARM_FP) && (__ARM_FP & 8) == 8
+        #if defined(__ARM_FP) && (__ARM_FP & 8) == 8 && defined(__ARM_PCS_VFP)
             #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_ARMV7EMDP)
-        #elif defined(__ARM_FP) && (__ARM_FP & 4) == 4
+        #elif defined(__ARM_FP) && (__ARM_FP & 4) == 4 && defined(__ARM_PCS_VFP)
             #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_ARMV7EMSP)
         #else
             #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_ARMV7EM)

tests/extmod/machine_i2s_rate.py

@@ -26,7 +26,10 @@
         (2, Pin("D4"), Pin("D3"), Pin("D2"), None),
     )
 elif "esp32" in sys.platform:
-    i2s_instances = ((0, Pin(18), Pin(19), Pin(21), Pin(14)),)
+    if "ESP32C3" in sys.implementation._machine or "ESP32-C3" in sys.implementation._machine:
+        i2s_instances = ((0, Pin(5), Pin(6), Pin(7), Pin(4)),)
+    else:
+        i2s_instances = ((0, Pin(18), Pin(19), Pin(21), Pin(14)),)
     # Allow for small additional RTOS overhead
     MAX_DELTA_MS = 8
 

tests/extmod/machine_soft_timer.py

@@ -2,7 +2,7 @@
 import sys
 
 
-if sys.platform in ("esp32", "esp8266"):
+if sys.platform in ("esp32", "esp8266", "nrf"):
     print("SKIP")  # TODO: Implement soft timers for esp32/esp8266 ports
     raise SystemExit
 

tests/extmod/machine_spi_rate.py

@@ -16,6 +16,9 @@
 if "alif" in sys.platform:
     MAX_DELTA_MS = 20
     spi_instances = ((0, None, None, None),)
+elif "samd" in sys.platform:
+    # Use default SPI instance (tested working on ADAFRUIT_ITSYBITSY_M0_EXPRESS).
+    spi_instances = ((None, None, None, None),)
 elif "pyboard" in sys.platform:
     spi_instances = (
         (1, None, None, None),  # "explicit choice of sck/mosi/miso is not implemented"
@@ -25,13 +28,19 @@
     spi_instances = ((0, Pin(18), Pin(19), Pin(16)),)
 elif "esp32" in sys.platform:
     impl = str(sys.implementation)
-    if any(soc in impl for soc in ("ESP32C2", "ESP32C3", "ESP32C6")):
-        spi_instances = ((1, Pin(4), Pin(5), Pin(6)),)
+    if any(soc in impl for soc in ("ESP32C2", "ESP32C3", "ESP32-C3", "ESP32C6")):
+        spi_instances = ((1, None, None, None),)
     else:
-        spi_instances = ((1, Pin(18), Pin(19), Pin(21)), (2, Pin(18), Pin(19), Pin(21)))
+        spi_instances = ((1, None, None, None), (2, None, None, None))
 elif "esp8266" in sys.platform:
     MAX_DELTA_MS = 50  # port requires much looser timing requirements
     spi_instances = ((1, None, None, None),)  # explicit pin choice not allowed
+elif "mimxrt" in sys.platform:
+    # Use default SPI instance (tested working on TEENSY40).
+    spi_instances = ((None, None, None, None),)
+elif "nrf" in sys.platform:
+    # Tested working on ARDUINO_NANO_33_BLE_SENSE.
+    spi_instances = ((1, None, None, None),)
 else:
     print("Please add support for this test on this platform.")
     raise SystemExit
@@ -111,8 +120,10 @@ def test_spi(spi_id, sck, mosi, miso, baudrate, polarity, phase, print_results):
             polarity=polarity,
             phase=phase,
         )
-    else:
+    elif spi_id is not None:
         s = SPI(spi_id, baudrate=baudrate, polarity=polarity, phase=phase)
+    else:
+        s = SPI(baudrate=baudrate, polarity=polarity, phase=phase)
 
     # to keep the test runtime down, use shorter buffer for lower baud rate
     wr_buf = wr_long if baudrate > 500_000 else wr_short

tests/extmod/time_res.py

@@ -37,9 +37,12 @@ def test():
         time.sleep_ms(100)
         for func_name, _ in EXPECTED_MAP:
             try:
-                time_func = getattr(time, func_name, None) or globals()[func_name]
+                if func_name.endswith("_time"):
+                    time_func = globals()[func_name]
+                else:
+                    time_func = getattr(time, func_name)
                 now = time_func()  # may raise AttributeError
-            except (KeyError, AttributeError):
+            except AttributeError:
                 continue
             try:
                 results_map[func_name].add(now)

tests/extmod/vfs_blockdev_invalid.py

@@ -45,6 +45,8 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMBlockDevice(50)
+    vfs.VfsLfs2.mkfs(bdev)
+    vfs.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit

tests/float/string_format_modulo2_intbig.py

@@ -1,5 +1,13 @@
 # test formatting floats with large precision, that it doesn't overflow the buffer
 
+try:
+    import micropython
+except:
+
+    class micropython:
+        def bytecode(f):
+            return f
+
 
 def test(num, num_str):
     if num == float("inf") or num == 0.0 and num_str != "0.0":
@@ -18,6 +26,12 @@ def test(num, num_str):
 
 
 # check most powers of 10, making sure to include exponents with 3 digits
-for e in range(-101, 102):
-    num = pow(10, e)
-    test(num, "1e%d" % e)
+# force bytecode emitter so it can feed the WDT on esp8266
+@micropython.bytecode
+def main():
+    for e in range(-101, 102):
+        num = pow(10, e)
+        test(num, "1e%d" % e)
+
+
+main()

tests/micropython/ringio_big.py

@@ -8,6 +8,8 @@
     print("SKIP")
     raise SystemExit
 
+result = []
+
 try:
     # The maximum possible size
     micropython.RingIO(bytearray(65535))
@@ -17,13 +19,15 @@
         # Buffer may not be too big
         micropython.RingIO(bytearray(65536))
     except ValueError as ex:
-        print(type(ex))
+        result.append(type(ex))
 
     try:
         # Size may not be too big
         micropython.RingIO(65535)
     except ValueError as ex:
-        print(type(ex))
+        result.append(type(ex))
 except MemoryError:
     print("SKIP")
     raise SystemExit
+
+print(result)

tests/micropython/ringio_big.py.exp

@@ -1,2 +1 @@
-<class 'ValueError'>
-<class 'ValueError'>
+[<class 'ValueError'>, <class 'ValueError'>]

tests/misc/rge_sm.py

@@ -29,7 +29,7 @@ def iterate(self):
             k = ktmp[:]
             step = [s + c * k[ik] for ik, s in enumerate(step)]
         if self.save:
-            self.Trajectory += [step]
+            self.Trajectory.append(step)
         else:
             self.Trajectory = [step]
         return True

tests/multi_extmod/machine_i2c_target_irq.py

@@ -15,32 +15,34 @@
     print("SKIP")
     raise SystemExit
 
+from target_wiring import i2c_args, i2c_kwargs
+
 ADDR = 67
 clock_stretch_us = 200
 
 # Configure pins based on the target.
-if sys.platform == "alif":
-    i2c_args = (1,)  # pins P3_7/P3_6
-    i2c_kwargs = {}
-elif sys.platform == "mimxrt":
-    i2c_args = (0,)  # pins 19/18 on Teensy 4.x
-    i2c_kwargs = {}
-    clock_stretch_us = 50  # mimxrt cannot delay too long in the IRQ handler
-elif sys.platform == "rp2":
-    i2c_args = (0,)
-    i2c_kwargs = {"scl": 9, "sda": 8}
-elif sys.platform == "pyboard":
-    i2c_args = ("Y",)
-    i2c_kwargs = {}
-elif sys.platform == "samd":
-    i2c_args = ()  # pins SCL/SDA
-    i2c_kwargs = {}
-elif "zephyr-rpi_pico" in sys.implementation._machine:
-    i2c_args = ("i2c1",)  # on gpio7/gpio6
-    i2c_kwargs = {}
-else:
-    print("Please add support for this test on this platform.")
-    raise SystemExit
+# if sys.platform == "alif":
+#     i2c_args = (1,)  # pins P3_7/P3_6
+#     i2c_kwargs = {}
+# elif sys.platform == "mimxrt":
+#     i2c_args = (0,)  # pins 19/18 on Teensy 4.x
+#     i2c_kwargs = {}
+#     clock_stretch_us = 50  # mimxrt cannot delay too long in the IRQ handler
+# elif sys.platform == "rp2":
+#     i2c_args = (0,)
+#     i2c_kwargs = {"scl": 9, "sda": 8}
+# elif sys.platform == "pyboard":
+#     i2c_args = ("Y",)
+#     i2c_kwargs = {}
+# elif sys.platform == "samd":
+#     i2c_args = ()  # pins SCL/SDA
+#     i2c_kwargs = {}
+# elif "zephyr-rpi_pico" in sys.implementation._machine:
+#     i2c_args = ("i2c1",)  # on gpio7/gpio6
+#     i2c_kwargs = {}
+# else:
+#     print("Please add support for this test on this platform.")
+#     raise SystemExit
 
 
 def simple_irq(i2c_target):

tests/multi_extmod/machine_i2c_target_memory.py

@@ -10,33 +10,35 @@
 import sys
 from machine import I2C, I2CTarget
 
+from target_wiring import i2c_args, i2c_kwargs
+
 ADDR = 67
 
-# Configure pins based on the target.
-if sys.platform == "alif":
-    i2c_args = (1,)  # pins P3_7/P3_6
-    i2c_kwargs = {}
-elif sys.platform == "esp32":
-    i2c_args = (1,)  # on pins 9/8
-    i2c_kwargs = {}
-elif sys.platform == "mimxrt":
-    i2c_args = (0,)  # pins 19/18 on Teensy 4.x
-    i2c_kwargs = {}
-elif sys.platform == "rp2":
-    i2c_args = (0,)
-    i2c_kwargs = {"scl": 9, "sda": 8}
-elif sys.platform == "pyboard":
-    i2c_args = ("Y",)
-    i2c_kwargs = {}
-elif sys.platform == "samd":
-    i2c_args = ()  # pins SCL/SDA
-    i2c_kwargs = {}
-elif "zephyr-rpi_pico" in sys.implementation._machine:
-    i2c_args = ("i2c1",)  # on gpio7/gpio6
-    i2c_kwargs = {}
-else:
-    print("Please add support for this test on this platform.")
-    raise SystemExit
+# # Configure pins based on the target.
+# if sys.platform == "alif":
+#     i2c_args = (1,)  # pins P3_7/P3_6
+#     i2c_kwargs = {}
+# elif sys.platform == "esp32":
+#     i2c_args = (1,)  # on pins 9/8
+#     i2c_kwargs = {}
+# elif sys.platform == "mimxrt":
+#     i2c_args = (0,)  # pins 19/18 on Teensy 4.x
+#     i2c_kwargs = {}
+# elif sys.platform == "rp2":
+#     i2c_args = (0,)
+#     i2c_kwargs = {"scl": 9, "sda": 8}
+# elif sys.platform == "pyboard":
+#     i2c_args = ("Y",)
+#     i2c_kwargs = {}
+# elif sys.platform == "samd":
+#     i2c_args = ()  # pins SCL/SDA
+#     i2c_kwargs = {}
+# elif "zephyr-rpi_pico" in sys.implementation._machine:
+#     i2c_args = ("i2c1",)  # on gpio7/gpio6
+#     i2c_kwargs = {}
+# else:
+#     print("Please add support for this test on this platform.")
+#     raise SystemExit
 
 
 def simple_irq(i2c_target):

tests/multi_net/asyncio_tls_server_client.py

@@ -62,5 +62,8 @@ def instance0():
 
 
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
     multitest.next()
     asyncio.run(tcp_client(b"client data"))

tests/multi_net/asyncio_tls_server_client_cert_required_error.py

@@ -8,6 +8,10 @@
     print("SKIP")
     raise SystemExit
 
+if not hasattr(ssl, "CERT_REQUIRED"):
+    print("SKIP")
+    raise SystemExit
+
 PORT = 8000
 
 # These are test certificates. See tests/README.md for details.

tests/multi_net/asyncio_tls_server_client_readline.py

@@ -66,5 +66,8 @@ def instance0():
 
 
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
     multitest.next()
     asyncio.run(tcp_client(b"client data\nclient data2\n"))

tests/multi_net/asyncio_tls_server_client_verify_error.py

@@ -66,5 +66,8 @@ def instance0():
 
 
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
     multitest.next()
     asyncio.run(tcp_client(b"client data"))

tests/multi_net/ssl_cert_ec.py

@@ -38,6 +38,9 @@ def instance0():
 
 # Client
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
     multitest.next()
     s = socket.socket()
     s.connect(socket.getaddrinfo(IP, PORT)[0][-1])

tests/multi_net/ssl_cert_rsa.py

@@ -38,6 +38,9 @@ def instance0():
 
 # Client
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
     multitest.next()
     s = socket.socket()
     s.connect(socket.getaddrinfo(IP, PORT)[0][-1])

tests/multi_net/sslcontext_check_hostname_error.py

@@ -36,6 +36,9 @@ def instance0():
 
 # Client
 def instance1():
+    if not hasattr(ssl, "CERT_REQUIRED"):
+        print("SKIP")
+        raise SystemExit
     multitest.next()
     s = socket.socket()
     s.connect(socket.getaddrinfo(IP, PORT)[0][-1])