uniformized and simplified testbench scoping

Author: psychogenic

src/examples/basic/tb.py

@@ -27,8 +27,9 @@
 from microcotb.triggers import RisingEdge, FallingEdge, ClockCycles, Timer
 from microcotb.utils import get_sim_time
 
-# get the @cocotb tests into a namespace
-cocotb.RunnerModuleName = 'basic'
+# get the detected @cocotb tests into a namespace
+# so we can load multiple such modules
+cocotb.set_runner_scope(__name__)
 
 from ttboard.demoboard import DemoBoard, RPMode
 from ttboard.cocotb.dut import DUT 
@@ -146,7 +147,7 @@ def run():
     tt.uio_oe_pico.value = 0 # all inputs
 
     # get a runner
-    runner = cocotb.get_runner('basic')
+    runner = cocotb.get_runner(__name__)
 
     # here's our DUT... you could subclass this and 
     # do cool things, like rename signals or access 

src/examples/tt_um_factory_test/tt_um_factory_test.py

@@ -16,8 +16,9 @@
 gc.collect()
 
 
-# get the @cocotb tests into a namespace
-cocotb.RunnerModuleName = 'tt_um_factory_test'
+# get the detected @cocotb tests into a namespace
+# so we can load multiple such modules
+cocotb.set_runner_scope(__name__)
 
 @cocotb.test()
 async def test_loopback(dut):
@@ -145,7 +146,7 @@ def __init__(self):
     TimeValue.ReBaseStringUnits = True # I like pretty strings
 
 
-    runner = cocotb.get_runner('tt_um_factory_test')
+    runner = cocotb.get_runner(__name__)
 
     dut = DUT()
     dut._log.info(f"enabled factory test project.  Will test with {runner}")

src/examples/tt_um_psychogenic_neptuneproportional/tt_um_psychogenic_neptuneproportional.py

@@ -9,8 +9,9 @@
 from microcotb.triggers import Timer, ClockCycles # RisingEdge, FallingEdge, Timer, ClockCycles
 
 
-# get the @cocotb tests into a namespace
-cocotb.RunnerModuleName = 'tt_um_psychogenic_neptune'
+# get the detected @cocotb tests into a namespace
+# so we can load multiple such modules
+cocotb.set_runner_scope(__name__)
 
 from ttboard.demoboard import DemoBoard, RPMode
 
@@ -202,7 +203,7 @@ def main():
     TimeValue.ReBaseStringUnits = True
 
     # create runner and DUT, and get tests going
-    runner = cocotb.get_runner('tt_um_psychogenic_neptune')
+    runner = cocotb.get_runner(__name__)
     dut = DUT()
     dut._log.info(f"enabled neptune project, will test with {runner}")
     runner.test(dut)

src/examples/tt_um_psychogenic_shaman/tb.py

@@ -18,6 +18,13 @@
 import hashlib
 import random 
 
+
+
+# get the detected @cocotb tests into a namespace
+# so we can load multiple such modules
+cocotb.set_runner_scope(__name__)
+
+
 GateLevelTest = False
 DoLongLongTest = False
 DoEverySizeBlockTest = False
@@ -619,7 +626,7 @@ def main():
     dut = DUT()
     tt.uio_oe_pico.value = dut.oe_pico_setting
 
-    runner = cocotb.get_runner('tt_um_psychogenic_shaman')
+    runner = cocotb.get_runner(__name__)
     dut._log.info(f"enabled shaman project. Will test with\n{runner}")
     runner.test(dut)
 

src/examples/tt_um_rejunity_sn76489/tt_um_rejunity_sn76489.py

@@ -31,8 +31,9 @@
 from microcotb.triggers import RisingEdge, FallingEdge, Timer, ClockCycles
 
 
-# get the @cocotb tests into a namespace
-cocotb.RunnerModuleName = 'tt_um_rejunity_snXXX'
+# get the detected @cocotb tests into a namespace
+# so we can load multiple such modules
+cocotb.set_runner_scope(__name__)
 
 # MASTER_CLOCK = 3_579_545 # NTSC frequency of SN as used in Sega Master System,    0xFE = 440 Hz
 # MASTER_CLOCK = 3_546_895 # PAL                 ---- // ----
@@ -611,5 +612,5 @@ def main(selection=None, master_clock=None, internal_clock_div = None):
 
     dut = DUT()
     dut._log.info("enabled factory test project, running")
-    runner = cocotb.get_runner('tt_um_rejunity_snXXX')
+    runner = cocotb.get_runner(__name__)
     runner.test(dut)

src/examples/tt_um_rgbled_decoder/tt_um_rgbled_decoder.py

@@ -26,9 +26,9 @@
 from microcotb.triggers import RisingEdge, FallingEdge, Timer, ClockCycles
 from microcotb.utils import get_sim_time
 
-
-# get the @cocotb tests into a namespace
-cocotb.RunnerModuleName = 'tt_um_rgbled_decoder'
+# get the detected @cocotb tests into a namespace
+# so we can load multiple such modules
+cocotb.set_runner_scope(__name__)
 
 
 def time_delta_not(cond:str):
@@ -230,7 +230,7 @@ def main():
 
     dut = DUT()
     dut._log.info("enabled rgbled project, running")
-    runner = cocotb.get_runner('tt_um_rgbled_decoder')
+    runner = cocotb.get_runner(__name__)
     runner.test(dut)
 
 

src/main.py

@@ -118,8 +118,6 @@ def stopClocking():
 
 def run_testbench_basic():
     import microcotb
-    # a uPython means to avoid having all
-    # decorators ever seen in the same test run:
     import examples.basic as test 
     test.run()
     return test