fix how long div tests run, de-comment FSM and DivPipeCore

diff --git a/src/soc/fu/div/test/test_all_pipe_caller.py b/src/soc/fu/div/test/test_all_pipe_caller.py
index fead90ff53a059b4392eabe45bf856fbe88f866e..31bea464411962e8f2ea0d0d274dca9d5a9b1fba 100644 (file)
--- a/src/soc/fu/div/test/test_all_pipe_caller.py
+++ b/src/soc/fu/div/test/test_all_pipe_caller.py
@@ -7,9 +7,10 @@ from soc.fu.test.common import TestCase
 from soc.fu.div.test.runner import DivRunner
 
 
-class DivTestCasesLong(unittest.TestCase):
-    def __init__(self):
-        self.test_data = []
+class DivTestLong(unittest.TestCase):
+    test_data = []
+    def __init__(self, name):
+        super().__init__(name)
         for n, v in self.__class__.__dict__.items():
             if n.startswith("test") and callable(v):
                 self._current_test_name = n
@@ -58,7 +59,10 @@ class DivTestCasesLong(unittest.TestCase):
 if __name__ == "__main__":
     unittest.main(exit=False)
     suite = unittest.TestSuite()
-    suite.addTest(DivRunner(DivTestCasesLong.test_data))
+    suite.addTest(DivRunner(DivTestLong.test_data, DivPipeKind.DivPipeCore))
+    suite.addTest(DivRunner(DivTestLong.test_data, DivPipeKind.FSMDivCore))
+    suite.addTest(DivRunner(DivTestLong.test_data, DivPipeKind.SimOnly))
+
 
     runner = unittest.TextTestRunner()
     runner.run(suite)

diff --git a/src/soc/fu/div/test/test_pipe_caller.py b/src/soc/fu/div/test/test_pipe_caller.py
index 6d5c03452307ed0406c6a51809ec502d000774bb..573816fff614ee3d737934586f7eac16ceb1fded 100644 (file)
--- a/src/soc/fu/div/test/test_pipe_caller.py
+++ b/src/soc/fu/div/test/test_pipe_caller.py
@@ -173,8 +173,8 @@ class DivTestCases(unittest.TestCase):
 if __name__ == "__main__":
     unittest.main(exit=False)
     suite = unittest.TestSuite()
-    #suite.addTest(DivRunner(DivTestCases.test_data, DivPipeKind.DivPipeCore))
-    #suite.addTest(DivRunner(DivTestCases.test_data, DivPipeKind.FSMDivCore))
+    suite.addTest(DivRunner(DivTestCases.test_data, DivPipeKind.DivPipeCore))
+    suite.addTest(DivRunner(DivTestCases.test_data, DivPipeKind.FSMDivCore))
     suite.addTest(DivRunner(DivTestCases.test_data, DivPipeKind.SimOnly))
 
     runner = unittest.TextTestRunner()