micropython · dpgeorge · Jan 22, 2024 · Jan 18, 2024 · Jan 18, 2024 · Jan 18, 2024
diff --git a/tests/extmod/machine_i2s_rate.py b/tests/extmod/machine_i2s_rate.py
@@ -9,28 +9,28 @@
 import time, sys
 
 # Configure pins based on the board.
+# A board must have at least one instance to test, both TX and RX mode.
 if "pyboard" in sys.platform:
-    i2s_id = 2
-    sck_pin = Pin("Y6")
-    ws_pin = Pin("Y5")
-    sd_tx_pin = sd_rx_pin = Pin("Y8")
+    i2s_instances = ((2, Pin("Y6"), Pin("Y5"), Pin("Y8"), Pin("Y8")),)
 elif "rp2" in sys.platform:
-    i2s_id = 1
-    sck_pin = Pin(0)
-    ws_pin = Pin(1)
-    sd_tx_pin = sd_rx_pin = Pin(2)
+    i2s_instances = (
+        (0, Pin(0), Pin(1), Pin(2), Pin(2)),
+        (1, Pin(0), Pin(1), Pin(2), Pin(2)),
+    )
 elif "mimxrt" in sys.platform:
-    i2s_id = 1
-    sck_pin = Pin(26)
-    ws_pin = Pin(27)
-    sd_tx_pin = Pin(7)
-    sd_rx_pin = Pin(8)
+    i2s_instances = (
+        (1, Pin("D26"), Pin("D27"), Pin("D7"), Pin("D8")),
+        (2, Pin("D4"), Pin("D3"), Pin("D2"), None),
+    )
 
 TEST_BYTES = b"01234567"
 RATE = 11025  # frames/sec
 
 
-def test(mode, sd_pin, bits_per_sample, frame_format):
+def test(i2s_id, sck_pin, ws_pin, sd_pin, mode, bits_per_sample, frame_format):
+    if sd_pin is None:
+        return
+
     i2s = I2S(
         i2s_id,
         sck=sck_pin,
@@ -48,16 +48,16 @@ def test(mode, sd_pin, bits_per_sample, frame_format):
     else:
         channels = 2
     bits_per_frame = bits_per_sample * channels
-    buf_len_250ms = bits_per_frame // 8 * RATE // 4
+    buf_len_200ms = bits_per_frame // 8 * RATE // 5
 
     # Create test data and preload I2S buffers.
     if mode == I2S.TX:
         mode_str = "TX"
-        data = TEST_BYTES * (buf_len_250ms // len(TEST_BYTES))
+        data = TEST_BYTES * (buf_len_200ms // len(TEST_BYTES))
         i2s.write(data)
     else:
         mode_str = "RX"
-        data = bytearray(len(TEST_BYTES) * (buf_len_250ms // len(TEST_BYTES)))
+        data = bytearray(len(TEST_BYTES) * (buf_len_200ms // len(TEST_BYTES)))
         i2s.readinto(data)
 
     # Time how long it takes to read/write 2 lots of data.
@@ -72,15 +72,27 @@ def test(mode, sd_pin, bits_per_sample, frame_format):
 
     i2s.deinit()
 
-    # Print out test result, time should be in range of 500ms.
-    print(mode_str, bits_per_sample, channels, abs(dt - 500) <= 4)
+    # Time should be in range of 400ms.
+    time_in_range = abs(dt - 400) <= 4
+
+    # Print out test result if requested, or if time not in range.
+    if print_results or not time_in_range:
+        print(mode_str, bits_per_sample, channels, time_in_range)
+
+
+print_results = True
 
+for i2s_id, sck_pin, ws_pin, sd_tx_pin, sd_rx_pin in i2s_instances:
+    test(i2s_id, sck_pin, ws_pin, sd_tx_pin, I2S.TX, 16, I2S.MONO)
+    test(i2s_id, sck_pin, ws_pin, sd_tx_pin, I2S.TX, 16, I2S.STEREO)
+    test(i2s_id, sck_pin, ws_pin, sd_tx_pin, I2S.TX, 32, I2S.MONO)
+    test(i2s_id, sck_pin, ws_pin, sd_tx_pin, I2S.TX, 32, I2S.STEREO)
+    test(i2s_id, sck_pin, ws_pin, sd_rx_pin, I2S.RX, 16, I2S.MONO)
+    test(i2s_id, sck_pin, ws_pin, sd_rx_pin, I2S.RX, 16, I2S.STEREO)
+    test(i2s_id, sck_pin, ws_pin, sd_rx_pin, I2S.RX, 32, I2S.MONO)
+    test(i2s_id, sck_pin, ws_pin, sd_rx_pin, I2S.RX, 32, I2S.STEREO)
 
-test(I2S.TX, sd_tx_pin, 16, I2S.MONO)
-test(I2S.TX, sd_tx_pin, 16, I2S.STEREO)
-test(I2S.TX, sd_tx_pin, 32, I2S.MONO)
-test(I2S.TX, sd_tx_pin, 32, I2S.STEREO)
-test(I2S.RX, sd_rx_pin, 16, I2S.MONO)
-test(I2S.RX, sd_rx_pin, 16, I2S.STEREO)
-test(I2S.RX, sd_rx_pin, 32, I2S.MONO)
-test(I2S.RX, sd_rx_pin, 32, I2S.STEREO)
+    # For any remaining tests, don't print the results if they pass.
+    # This is to have the same output on all boards regardless of
+    # how many I2S instances they test.
+    print_results = False
diff --git a/tests/wipy/adc.py → tests/ports/cc3200/adc.py b/tests/wipy/adc.py → tests/ports/cc3200/adc.py
diff --git a/tests/wipy/adc.py.exp → tests/ports/cc3200/adc.py.exp b/tests/wipy/adc.py.exp → tests/ports/cc3200/adc.py.exp
diff --git a/tests/wipy/i2c.py → tests/ports/cc3200/i2c.py b/tests/wipy/i2c.py → tests/ports/cc3200/i2c.py
diff --git a/tests/wipy/i2c.py.exp → tests/ports/cc3200/i2c.py.exp b/tests/wipy/i2c.py.exp → tests/ports/cc3200/i2c.py.exp
diff --git a/tests/wipy/modwipy.py → tests/ports/cc3200/modwipy.py b/tests/wipy/modwipy.py → tests/ports/cc3200/modwipy.py
diff --git a/tests/wipy/modwipy.py.exp → tests/ports/cc3200/modwipy.py.exp b/tests/wipy/modwipy.py.exp → tests/ports/cc3200/modwipy.py.exp
diff --git a/tests/wipy/os.py → tests/ports/cc3200/os.py b/tests/wipy/os.py → tests/ports/cc3200/os.py
diff --git a/tests/wipy/os.py.exp → tests/ports/cc3200/os.py.exp b/tests/wipy/os.py.exp → tests/ports/cc3200/os.py.exp
diff --git a/tests/wipy/pin.py → tests/ports/cc3200/pin.py b/tests/wipy/pin.py → tests/ports/cc3200/pin.py
diff --git a/tests/wipy/pin.py.exp → tests/ports/cc3200/pin.py.exp b/tests/wipy/pin.py.exp → tests/ports/cc3200/pin.py.exp
diff --git a/tests/wipy/pin_irq.py → tests/ports/cc3200/pin_irq.py b/tests/wipy/pin_irq.py → tests/ports/cc3200/pin_irq.py
diff --git a/tests/wipy/pin_irq.py.exp → tests/ports/cc3200/pin_irq.py.exp b/tests/wipy/pin_irq.py.exp → tests/ports/cc3200/pin_irq.py.exp
diff --git a/tests/wipy/reset/reset.py → tests/ports/cc3200/reset/reset.py b/tests/wipy/reset/reset.py → tests/ports/cc3200/reset/reset.py
diff --git a/tests/wipy/reset/reset.py.exp → tests/ports/cc3200/reset/reset.py.exp b/tests/wipy/reset/reset.py.exp → tests/ports/cc3200/reset/reset.py.exp
diff --git a/tests/wipy/rtc.py → tests/ports/cc3200/rtc.py b/tests/wipy/rtc.py → tests/ports/cc3200/rtc.py
diff --git a/tests/wipy/rtc.py.exp → tests/ports/cc3200/rtc.py.exp b/tests/wipy/rtc.py.exp → tests/ports/cc3200/rtc.py.exp
diff --git a/tests/wipy/sd.py → tests/ports/cc3200/sd.py b/tests/wipy/sd.py → tests/ports/cc3200/sd.py
diff --git a/tests/wipy/sd.py.exp → tests/ports/cc3200/sd.py.exp b/tests/wipy/sd.py.exp → tests/ports/cc3200/sd.py.exp
diff --git a/tests/wipy/skipped/rtc_irq.py → tests/ports/cc3200/skipped/rtc_irq.py b/tests/wipy/skipped/rtc_irq.py → tests/ports/cc3200/skipped/rtc_irq.py
diff --git a/tests/wipy/skipped/rtc_irq.py.exp → tests/ports/cc3200/skipped/rtc_irq.py.exp b/tests/wipy/skipped/rtc_irq.py.exp → tests/ports/cc3200/skipped/rtc_irq.py.exp
diff --git a/tests/wipy/spi.py → tests/ports/cc3200/spi.py b/tests/wipy/spi.py → tests/ports/cc3200/spi.py
diff --git a/tests/wipy/spi.py.exp → tests/ports/cc3200/spi.py.exp b/tests/wipy/spi.py.exp → tests/ports/cc3200/spi.py.exp
diff --git a/tests/wipy/time.py → tests/ports/cc3200/time.py b/tests/wipy/time.py → tests/ports/cc3200/time.py
diff --git a/tests/wipy/time.py.exp → tests/ports/cc3200/time.py.exp b/tests/wipy/time.py.exp → tests/ports/cc3200/time.py.exp
diff --git a/tests/wipy/timer.py → tests/ports/cc3200/timer.py b/tests/wipy/timer.py → tests/ports/cc3200/timer.py
diff --git a/tests/wipy/timer.py.exp → tests/ports/cc3200/timer.py.exp b/tests/wipy/timer.py.exp → tests/ports/cc3200/timer.py.exp
diff --git a/tests/wipy/uart.py → tests/ports/cc3200/uart.py b/tests/wipy/uart.py → tests/ports/cc3200/uart.py
diff --git a/tests/wipy/uart.py.exp → tests/ports/cc3200/uart.py.exp b/tests/wipy/uart.py.exp → tests/ports/cc3200/uart.py.exp
diff --git a/tests/wipy/uart_irq.py → tests/ports/cc3200/uart_irq.py b/tests/wipy/uart_irq.py → tests/ports/cc3200/uart_irq.py
diff --git a/tests/wipy/uart_irq.py.exp → tests/ports/cc3200/uart_irq.py.exp b/tests/wipy/uart_irq.py.exp → tests/ports/cc3200/uart_irq.py.exp
diff --git a/tests/wipy/wdt.py → tests/ports/cc3200/wdt.py b/tests/wipy/wdt.py → tests/ports/cc3200/wdt.py
diff --git a/tests/wipy/wdt.py.exp → tests/ports/cc3200/wdt.py.exp b/tests/wipy/wdt.py.exp → tests/ports/cc3200/wdt.py.exp
diff --git a/tests/wipy/wlan/machine.py → tests/ports/cc3200/wlan/machine.py b/tests/wipy/wlan/machine.py → tests/ports/cc3200/wlan/machine.py
diff --git a/tests/wipy/wlan/machine.py.exp → tests/ports/cc3200/wlan/machine.py.exp b/tests/wipy/wlan/machine.py.exp → tests/ports/cc3200/wlan/machine.py.exp
diff --git a/tests/wipy/wlan/server.py → tests/ports/cc3200/wlan/server.py b/tests/wipy/wlan/server.py → tests/ports/cc3200/wlan/server.py
diff --git a/tests/wipy/wlan/server.py.exp → tests/ports/cc3200/wlan/server.py.exp b/tests/wipy/wlan/server.py.exp → tests/ports/cc3200/wlan/server.py.exp
diff --git a/tests/wipy/wlan/wlan.py → tests/ports/cc3200/wlan/wlan.py b/tests/wipy/wlan/wlan.py → tests/ports/cc3200/wlan/wlan.py
diff --git a/tests/wipy/wlan/wlan.py.exp → tests/ports/cc3200/wlan/wlan.py.exp b/tests/wipy/wlan/wlan.py.exp → tests/ports/cc3200/wlan/wlan.py.exp
diff --git a/tests/esp32/check_err_str.py → tests/ports/esp32/check_err_str.py b/tests/esp32/check_err_str.py → tests/ports/esp32/check_err_str.py
diff --git a/tests/esp32/check_err_str.py.exp → tests/ports/esp32/check_err_str.py.exp b/tests/esp32/check_err_str.py.exp → tests/ports/esp32/check_err_str.py.exp
diff --git a/tests/esp32/esp32_idf_heap_info.py → tests/ports/esp32/esp32_idf_heap_info.py b/tests/esp32/esp32_idf_heap_info.py → tests/ports/esp32/esp32_idf_heap_info.py
diff --git a/tests/esp32/esp32_idf_heap_info.py.exp → tests/ports/esp32/esp32_idf_heap_info.py.exp b/tests/esp32/esp32_idf_heap_info.py.exp → tests/ports/esp32/esp32_idf_heap_info.py.exp
diff --git a/tests/esp32/esp32_nvs.py → tests/ports/esp32/esp32_nvs.py b/tests/esp32/esp32_nvs.py → tests/ports/esp32/esp32_nvs.py
diff --git a/tests/esp32/esp32_nvs.py.exp → tests/ports/esp32/esp32_nvs.py.exp b/tests/esp32/esp32_nvs.py.exp → tests/ports/esp32/esp32_nvs.py.exp
diff --git a/tests/esp32/partition_ota.py → tests/ports/esp32/partition_ota.py b/tests/esp32/partition_ota.py → tests/ports/esp32/partition_ota.py
diff --git a/tests/esp32/partition_ota.py.exp → tests/ports/esp32/partition_ota.py.exp b/tests/esp32/partition_ota.py.exp → tests/ports/esp32/partition_ota.py.exp
diff --git a/tests/esp32/resolve_on_connect.py → tests/ports/esp32/resolve_on_connect.py b/tests/esp32/resolve_on_connect.py → tests/ports/esp32/resolve_on_connect.py
diff --git a/tests/qemu-arm/asm_test.py → tests/ports/qemu-arm/asm_test.py b/tests/qemu-arm/asm_test.py → tests/ports/qemu-arm/asm_test.py
diff --git a/tests/qemu-arm/asm_test.py.exp → tests/ports/qemu-arm/asm_test.py.exp b/tests/qemu-arm/asm_test.py.exp → tests/ports/qemu-arm/asm_test.py.exp
diff --git a/tests/qemu-arm/native_test.py → tests/ports/qemu-arm/native_test.py b/tests/qemu-arm/native_test.py → tests/ports/qemu-arm/native_test.py
diff --git a/tests/qemu-arm/native_test.py.exp → tests/ports/qemu-arm/native_test.py.exp b/tests/qemu-arm/native_test.py.exp → tests/ports/qemu-arm/native_test.py.exp
diff --git a/tests/qemu-arm/viper_test.py → tests/ports/qemu-arm/viper_test.py b/tests/qemu-arm/viper_test.py → tests/ports/qemu-arm/viper_test.py
diff --git a/tests/qemu-arm/viper_test.py.exp → tests/ports/qemu-arm/viper_test.py.exp b/tests/qemu-arm/viper_test.py.exp → tests/ports/qemu-arm/viper_test.py.exp
diff --git a/tests/renesas-ra/freq.py → tests/ports/renesas-ra/freq.py b/tests/renesas-ra/freq.py → tests/ports/renesas-ra/freq.py
diff --git a/tests/renesas-ra/freq.py.exp → tests/ports/renesas-ra/freq.py.exp b/tests/renesas-ra/freq.py.exp → tests/ports/renesas-ra/freq.py.exp
diff --git a/tests/renesas-ra/i2c.py → tests/ports/renesas-ra/i2c.py b/tests/renesas-ra/i2c.py → tests/ports/renesas-ra/i2c.py
diff --git a/tests/renesas-ra/i2c.py.exp → tests/ports/renesas-ra/i2c.py.exp b/tests/renesas-ra/i2c.py.exp → tests/ports/renesas-ra/i2c.py.exp
diff --git a/tests/pyb/modtime.py → tests/ports/renesas-ra/modtime.py b/tests/pyb/modtime.py → tests/ports/renesas-ra/modtime.py
diff --git a/tests/pyb/modtime.py.exp → tests/ports/renesas-ra/modtime.py.exp b/tests/pyb/modtime.py.exp → tests/ports/renesas-ra/modtime.py.exp
diff --git a/tests/renesas-ra/pin.py → tests/ports/renesas-ra/pin.py b/tests/renesas-ra/pin.py → tests/ports/renesas-ra/pin.py
diff --git a/tests/renesas-ra/pin.py.exp → tests/ports/renesas-ra/pin.py.exp b/tests/renesas-ra/pin.py.exp → tests/ports/renesas-ra/pin.py.exp
diff --git a/tests/renesas-ra/rtc_init.py → tests/ports/renesas-ra/rtc_init.py b/tests/renesas-ra/rtc_init.py → tests/ports/renesas-ra/rtc_init.py
diff --git a/tests/renesas-ra/rtc_init.py.exp → tests/ports/renesas-ra/rtc_init.py.exp b/tests/renesas-ra/rtc_init.py.exp → tests/ports/renesas-ra/rtc_init.py.exp
diff --git a/tests/renesas-ra/spi.py → tests/ports/renesas-ra/spi.py b/tests/renesas-ra/spi.py → tests/ports/renesas-ra/spi.py
diff --git a/tests/renesas-ra/spi.py.exp → tests/ports/renesas-ra/spi.py.exp b/tests/renesas-ra/spi.py.exp → tests/ports/renesas-ra/spi.py.exp
diff --git a/tests/renesas-ra/uart1.py → tests/ports/renesas-ra/uart1.py b/tests/renesas-ra/uart1.py → tests/ports/renesas-ra/uart1.py
diff --git a/tests/renesas-ra/uart1.py.exp → tests/ports/renesas-ra/uart1.py.exp b/tests/renesas-ra/uart1.py.exp → tests/ports/renesas-ra/uart1.py.exp
diff --git a/tests/ports/rp2/rp2_dma.py b/tests/ports/rp2/rp2_dma.py
@@ -0,0 +1,90 @@
+# Test rp2.DMA functionality.
+
+import time
+import machine
+import rp2
+
+src = bytes(i & 0xFF for i in range(16 * 1024))
+
+print("# test basic usage")
+
+dma = rp2.DMA()
+print(dma)
+print(rp2.DMA.unpack_ctrl(dma.pack_ctrl()))
+dma.read = 0
+dma.write = 0
+dma.count = 0
+dma.ctrl = dma.pack_ctrl()
+print(dma.read, dma.write, dma.count, dma.ctrl & 0x01FFFFFF, dma.channel, dma.registers)
+dma.close()
+
+# Test closing when already closed.
+dma.close()
+
+# Test using when closed.
+try:
+    dma.active()
+    assert False
+except ValueError:
+    print("ValueError")
+
+# Test simple memory copy.
+print("# test memory copy")
+dest = bytearray(1024)
+dma = rp2.DMA()
+dma.config(read=src, write=dest, count=len(dest) // 4, ctrl=dma.pack_ctrl(), trigger=False)
+print(not any(dest))
+dma.active(True)
+while dma.active():
+    pass
+print(dest[:8], dest[-8:])
+dma.close()
+
+
+# Test time taken for a large memory copy.
+def run_and_time_dma(dma):
+    ticks_us = time.ticks_us
+    irq_state = machine.disable_irq()
+    t0 = ticks_us()
+    dma.active(True)
+    while dma.active():
+        pass
+    t1 = ticks_us()
+    machine.enable_irq(irq_state)
+    return time.ticks_diff(t1, t0)
+
+
+print("# test timing")
+dest = bytearray(16 * 1024)
+dma = rp2.DMA()
+dma.read = src
+dma.write = dest
+dma.count = len(dest) // 4
+dma.ctrl = dma.pack_ctrl()
+dt = run_and_time_dma(dma)
+print(60 <= dt <= 90)
+print(dest[:8], dest[-8:])
+dma.close()
+
+# Test using .config(trigger=True).
+print("# test immediate trigger")
+dest = bytearray(1024)
+dma = rp2.DMA()
+dma.config(read=src, write=dest, count=len(dest) // 4, ctrl=dma.pack_ctrl(), trigger=True)
+while dma.active():
+    pass
+print(dest[:8], dest[-8:])
+dma.close()
+
+# Test the DMA.irq() method.
+print("# test irq")
+dest = bytearray(1024)
+dma = rp2.DMA()
+dma.irq(lambda _: print("irq fired"))
+dma.config(
+    read=src, write=dest, count=len(dest) // 4, ctrl=dma.pack_ctrl(irq_quiet=0), trigger=True
+)
+while dma.active():
+    pass
+print(dest[:8], dest[-8:])
+dma.close()
diff --git a/tests/ports/rp2/rp2_dma.py.exp b/tests/ports/rp2/rp2_dma.py.exp
@@ -0,0 +1,16 @@
+# test basic usage
+DMA(0)
+{'inc_read': 1, 'high_pri': 0, 'write_err': 0, 'ring_sel': 0, 'enable': 1, 'treq_sel': 63, 'sniff_en': 0, 'irq_quiet': 1, 'read_err': 0, 'chain_to': 0, 'busy': 0, 'inc_write': 1, 'ring_size': 0, 'bswap': 0, 'size': 2, 'ahb_err': 0}
+0 0 0 4161593 0 <memoryview>
+ValueError
+# test memory copy
+True
+bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff')
+# test timing
+True
+bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff')
+# test immediate trigger
+bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff')
+# test irq
+irq fired
+bytearray(b'\x00\x01\x02\x03\x04\x05\x06\x07') bytearray(b'\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff')
diff --git a/tests/pyb/accel.py → tests/ports/stm32/accel.py b/tests/pyb/accel.py → tests/ports/stm32/accel.py
diff --git a/tests/pyb/accel.py.exp → tests/ports/stm32/accel.py.exp b/tests/pyb/accel.py.exp → tests/ports/stm32/accel.py.exp
diff --git a/tests/pyb/adc.py → tests/ports/stm32/adc.py b/tests/pyb/adc.py → tests/ports/stm32/adc.py
diff --git a/tests/pyb/adc.py.exp → tests/ports/stm32/adc.py.exp b/tests/pyb/adc.py.exp → tests/ports/stm32/adc.py.exp
diff --git a/tests/pyb/adcall.py → tests/ports/stm32/adcall.py b/tests/pyb/adcall.py → tests/ports/stm32/adcall.py
diff --git a/tests/pyb/adcall.py.exp → tests/ports/stm32/adcall.py.exp b/tests/pyb/adcall.py.exp → tests/ports/stm32/adcall.py.exp
diff --git a/tests/pyb/board_pybv1x.py → tests/ports/stm32/board_pybv1x.py b/tests/pyb/board_pybv1x.py → tests/ports/stm32/board_pybv1x.py
diff --git a/tests/pyb/board_pybv1x.py.exp → tests/ports/stm32/board_pybv1x.py.exp b/tests/pyb/board_pybv1x.py.exp → tests/ports/stm32/board_pybv1x.py.exp
diff --git a/tests/pyb/can.py → tests/ports/stm32/can.py b/tests/pyb/can.py → tests/ports/stm32/can.py
diff --git a/tests/pyb/can.py.exp → tests/ports/stm32/can.py.exp b/tests/pyb/can.py.exp → tests/ports/stm32/can.py.exp
diff --git a/tests/pyb/can2.py → tests/ports/stm32/can2.py b/tests/pyb/can2.py → tests/ports/stm32/can2.py
diff --git a/tests/pyb/can2.py.exp → tests/ports/stm32/can2.py.exp b/tests/pyb/can2.py.exp → tests/ports/stm32/can2.py.exp
diff --git a/tests/pyb/dac.py → tests/ports/stm32/dac.py b/tests/pyb/dac.py → tests/ports/stm32/dac.py
diff --git a/tests/pyb/dac.py.exp → tests/ports/stm32/dac.py.exp b/tests/pyb/dac.py.exp → tests/ports/stm32/dac.py.exp
diff --git a/tests/pyb/extint.py → tests/ports/stm32/extint.py b/tests/pyb/extint.py → tests/ports/stm32/extint.py
diff --git a/tests/pyb/extint.py.exp → tests/ports/stm32/extint.py.exp b/tests/pyb/extint.py.exp → tests/ports/stm32/extint.py.exp
diff --git a/tests/pyb/i2c.py → tests/ports/stm32/i2c.py b/tests/pyb/i2c.py → tests/ports/stm32/i2c.py
diff --git a/tests/pyb/i2c.py.exp → tests/ports/stm32/i2c.py.exp b/tests/pyb/i2c.py.exp → tests/ports/stm32/i2c.py.exp
diff --git a/tests/pyb/i2c_accel.py → tests/ports/stm32/i2c_accel.py b/tests/pyb/i2c_accel.py → tests/ports/stm32/i2c_accel.py
diff --git a/tests/pyb/i2c_accel.py.exp → tests/ports/stm32/i2c_accel.py.exp b/tests/pyb/i2c_accel.py.exp → tests/ports/stm32/i2c_accel.py.exp
diff --git a/tests/pyb/i2c_error.py → tests/ports/stm32/i2c_error.py b/tests/pyb/i2c_error.py → tests/ports/stm32/i2c_error.py
diff --git a/tests/pyb/i2c_error.py.exp → tests/ports/stm32/i2c_error.py.exp b/tests/pyb/i2c_error.py.exp → tests/ports/stm32/i2c_error.py.exp
diff --git a/tests/pyb/irq.py → tests/ports/stm32/irq.py b/tests/pyb/irq.py → tests/ports/stm32/irq.py
diff --git a/tests/pyb/irq.py.exp → tests/ports/stm32/irq.py.exp b/tests/pyb/irq.py.exp → tests/ports/stm32/irq.py.exp
diff --git a/tests/pyb/led.py → tests/ports/stm32/led.py b/tests/pyb/led.py → tests/ports/stm32/led.py
diff --git a/tests/pyb/led.py.exp → tests/ports/stm32/led.py.exp b/tests/pyb/led.py.exp → tests/ports/stm32/led.py.exp
diff --git a/tests/pyb/modstm.py → tests/ports/stm32/modstm.py b/tests/pyb/modstm.py → tests/ports/stm32/modstm.py
diff --git a/tests/pyb/modstm.py.exp → tests/ports/stm32/modstm.py.exp b/tests/pyb/modstm.py.exp → tests/ports/stm32/modstm.py.exp
diff --git a/tests/renesas-ra/modtime.py → tests/ports/stm32/modtime.py b/tests/renesas-ra/modtime.py → tests/ports/stm32/modtime.py
diff --git a/tests/renesas-ra/modtime.py.exp → tests/ports/stm32/modtime.py.exp b/tests/renesas-ra/modtime.py.exp → tests/ports/stm32/modtime.py.exp
diff --git a/tests/pyb/pin.py → tests/ports/stm32/pin.py b/tests/pyb/pin.py → tests/ports/stm32/pin.py
diff --git a/tests/pyb/pin.py.exp → tests/ports/stm32/pin.py.exp b/tests/pyb/pin.py.exp → tests/ports/stm32/pin.py.exp
diff --git a/tests/pyb/pyb1.py → tests/ports/stm32/pyb1.py b/tests/pyb/pyb1.py → tests/ports/stm32/pyb1.py
diff --git a/tests/pyb/pyb1.py.exp → tests/ports/stm32/pyb1.py.exp b/tests/pyb/pyb1.py.exp → tests/ports/stm32/pyb1.py.exp
diff --git a/tests/pyb/pyb_f405.py → tests/ports/stm32/pyb_f405.py b/tests/pyb/pyb_f405.py → tests/ports/stm32/pyb_f405.py
diff --git a/tests/pyb/pyb_f405.py.exp → tests/ports/stm32/pyb_f405.py.exp b/tests/pyb/pyb_f405.py.exp → tests/ports/stm32/pyb_f405.py.exp
diff --git a/tests/pyb/pyb_f411.py → tests/ports/stm32/pyb_f411.py b/tests/pyb/pyb_f411.py → tests/ports/stm32/pyb_f411.py
diff --git a/tests/pyb/pyb_f411.py.exp → tests/ports/stm32/pyb_f411.py.exp b/tests/pyb/pyb_f411.py.exp → tests/ports/stm32/pyb_f411.py.exp
diff --git a/tests/pyb/rtc.py → tests/ports/stm32/rtc.py b/tests/pyb/rtc.py → tests/ports/stm32/rtc.py
diff --git a/tests/pyb/rtc.py.exp → tests/ports/stm32/rtc.py.exp b/tests/pyb/rtc.py.exp → tests/ports/stm32/rtc.py.exp
diff --git a/tests/pyb/servo.py → tests/ports/stm32/servo.py b/tests/pyb/servo.py → tests/ports/stm32/servo.py
diff --git a/tests/pyb/servo.py.exp → tests/ports/stm32/servo.py.exp b/tests/pyb/servo.py.exp → tests/ports/stm32/servo.py.exp
diff --git a/tests/pyb/spi.py → tests/ports/stm32/spi.py b/tests/pyb/spi.py → tests/ports/stm32/spi.py
diff --git a/tests/pyb/spi.py.exp → tests/ports/stm32/spi.py.exp b/tests/pyb/spi.py.exp → tests/ports/stm32/spi.py.exp
diff --git a/tests/pyb/switch.py → tests/ports/stm32/switch.py b/tests/pyb/switch.py → tests/ports/stm32/switch.py
diff --git a/tests/pyb/switch.py.exp → tests/ports/stm32/switch.py.exp b/tests/pyb/switch.py.exp → tests/ports/stm32/switch.py.exp
diff --git a/tests/pyb/timer.py → tests/ports/stm32/timer.py b/tests/pyb/timer.py → tests/ports/stm32/timer.py
diff --git a/tests/pyb/timer.py.exp → tests/ports/stm32/timer.py.exp b/tests/pyb/timer.py.exp → tests/ports/stm32/timer.py.exp
diff --git a/tests/pyb/timer_callback.py → tests/ports/stm32/timer_callback.py b/tests/pyb/timer_callback.py → tests/ports/stm32/timer_callback.py
diff --git a/tests/pyb/timer_callback.py.exp → tests/ports/stm32/timer_callback.py.exp b/tests/pyb/timer_callback.py.exp → tests/ports/stm32/timer_callback.py.exp
diff --git a/tests/pyb/uart.py → tests/ports/stm32/uart.py b/tests/pyb/uart.py → tests/ports/stm32/uart.py
diff --git a/tests/pyb/uart.py.exp → tests/ports/stm32/uart.py.exp b/tests/pyb/uart.py.exp → tests/ports/stm32/uart.py.exp
diff --git a/tests/unix/extra_coverage.py → tests/ports/unix/extra_coverage.py b/tests/unix/extra_coverage.py → tests/ports/unix/extra_coverage.py
diff --git a/tests/unix/extra_coverage.py.exp → tests/ports/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp → tests/ports/unix/extra_coverage.py.exp
diff --git a/tests/unix/ffi_callback.py → tests/ports/unix/ffi_callback.py b/tests/unix/ffi_callback.py → tests/ports/unix/ffi_callback.py
diff --git a/tests/unix/ffi_callback.py.exp → tests/ports/unix/ffi_callback.py.exp b/tests/unix/ffi_callback.py.exp → tests/ports/unix/ffi_callback.py.exp
diff --git a/tests/unix/ffi_float.py → tests/ports/unix/ffi_float.py b/tests/unix/ffi_float.py → tests/ports/unix/ffi_float.py
diff --git a/tests/unix/ffi_float.py.exp → tests/ports/unix/ffi_float.py.exp b/tests/unix/ffi_float.py.exp → tests/ports/unix/ffi_float.py.exp
diff --git a/tests/unix/ffi_float2.py → tests/ports/unix/ffi_float2.py b/tests/unix/ffi_float2.py → tests/ports/unix/ffi_float2.py
diff --git a/tests/unix/ffi_float2.py.exp → tests/ports/unix/ffi_float2.py.exp b/tests/unix/ffi_float2.py.exp → tests/ports/unix/ffi_float2.py.exp
diff --git a/tests/unix/ffi_lib.c → tests/ports/unix/ffi_lib.c b/tests/unix/ffi_lib.c → tests/ports/unix/ffi_lib.c
diff --git a/tests/unix/ffi_types.py → tests/ports/unix/ffi_types.py b/tests/unix/ffi_types.py → tests/ports/unix/ffi_types.py
diff --git a/tests/unix/ffi_types.py.exp → tests/ports/unix/ffi_types.py.exp b/tests/unix/ffi_types.py.exp → tests/ports/unix/ffi_types.py.exp
diff --git a/tests/unix/mod_os.py → tests/ports/unix/mod_os.py b/tests/unix/mod_os.py → tests/ports/unix/mod_os.py
diff --git a/tests/unix/mod_os.py.exp → tests/ports/unix/mod_os.py.exp b/tests/unix/mod_os.py.exp → tests/ports/unix/mod_os.py.exp
diff --git a/tests/unix/time_mktime_localtime.py → tests/ports/unix/time_mktime_localtime.py b/tests/unix/time_mktime_localtime.py → tests/ports/unix/time_mktime_localtime.py
diff --git a/tests/run-tests.py b/tests/run-tests.py
@@ -183,7 +183,7 @@ def run_script_on_remote_target(pyb, args, test_file, is_special):
         "basics/bytes_compare3.py",
         "basics/builtin_help.py",
         "thread/thread_exc2.py",
-        "esp32/partition_ota.py",
+        "ports/esp32/partition_ota.py",
     )
 ]
 
@@ -1036,16 +1036,16 @@ def main():
             )
             if args.target == "pyboard":
                 # run pyboard tests
-                test_dirs += ("float", "stress", "pyb", "inlineasm")
+                test_dirs += ("float", "stress", "inlineasm", "ports/stm32")
             elif args.target in ("renesas-ra"):
-                test_dirs += ("float", "inlineasm", "renesas-ra")
+                test_dirs += ("float", "inlineasm", "ports/renesas-ra")
             elif args.target == "rp2":
-                test_dirs += ("float", "stress", "inlineasm", "thread")
+                test_dirs += ("float", "stress", "inlineasm", "thread", "ports/rp2")
             elif args.target in ("esp8266", "esp32", "minimal", "nrf"):
                 test_dirs += ("float",)
             elif args.target == "wipy":
                 # run WiPy tests
-                test_dirs += ("wipy",)
+                test_dirs += ("ports/cc3200",)
             elif args.target == "unix":
                 # run PC tests
                 test_dirs += (
@@ -1054,8 +1054,8 @@ def main():
                     "io",
                     "stress",
                     "unicode",
-                    "unix",
                     "cmdline",
+                    "ports/unix",
                 )
             elif args.target == "qemu-arm":
                 if not args.write_exp:
@@ -1065,7 +1065,7 @@ def main():
                 test_dirs += (
                     "float",
                     "inlineasm",
-                    "qemu-arm",
+                    "ports/qemu-arm",
                 )
         else:
             # run tests from these directories

diff --git a/tools/ci.sh b/tools/ci.sh
@@ -415,7 +415,7 @@ function ci_unix_build_helper {
 }
 
 function ci_unix_build_ffi_lib_helper {
-    $1 $2 -shared -o tests/unix/ffi_lib.so tests/unix/ffi_lib.c
+    $1 $2 -shared -o tests/ports/unix/ffi_lib.so tests/ports/unix/ffi_lib.c
 }
 
 function ci_unix_run_tests_helper {