update cam test

diff --git a/src/TLB/Cam.py b/src/TLB/Cam.py
index 3c499211ced38cc95da62f270311159213e13fe0..46ba27bd8e3fd9e5f3b94b8fbe2165871ae29e6e 100644 (file)
--- a/src/TLB/Cam.py
+++ b/src/TLB/Cam.py
@@ -2,8 +2,9 @@ from nmigen import Array, Cat, Module, Signal
 from nmigen.lib.coding import Decoder
 from nmigen.cli import main #, verilog
 
-from CamEntry import CamEntry
-from AddressEncoder import AddressEncoder
+from .CamEntry import CamEntry
+from .AddressEncoder import AddressEncoder
+
 
 class Cam():
     """ Content Addressable Memory (CAM)

diff --git a/src/TLB/test/test_cam.py b/src/TLB/test/test_cam.py
index 0047f53835bf5dc3e51d81192b42daa3bfb29ba8..f11c48add0949ccd5dd6091e95bc9440b9ae6af6 100644 (file)
--- a/src/TLB/test/test_cam.py
+++ b/src/TLB/test/test_cam.py
@@ -1,12 +1,8 @@
-import sys
-sys.path.append("../src")
-sys.path.append("../../TestUtil")
-
 from nmigen.compat.sim import run_simulation
 
-from Cam import Cam
+from TLB.Cam import Cam
 
-from test_helper import assert_eq, assert_ne, assert_op
+from TestUtil.test_helper import assert_eq, assert_ne, assert_op
 
 # This function allows for the easy setting of values to the Cam
 # Arguments:
@@ -63,7 +59,7 @@ def check_all(dut, mm, sm, ma, mm_op, sm_op, ma_op):
     yield from check_single_match(dut, sm, sm_op)
     yield from check_match_address(dut, ma, ma_op)
 
-def testbench(dut):
+def tbench(dut):
     # NA
     enable = 0
     write_enable = 0
@@ -201,7 +197,10 @@ def testbench(dut):
     yield
 
 
-if __name__ == "__main__":
+def test_cam():
     dut = Cam(4, 4)
-    run_simulation(dut, testbench(dut), vcd_name="Waveforms/test_cam.vcd")
+    run_simulation(dut, tbench(dut), vcd_name="Waveforms/test_cam.vcd")
     print("Cam Unit Test Success")
+
+if __name__ == "__main__":
+    test_cam()