no global variables in test suites

diff --git a/src/soc/fu/branch/test/test_pipe_caller.py b/src/soc/fu/branch/test/test_pipe_caller.py
index 8a28141170a818fe345ced6bae499239b683c805..99913dcbc8ee82e2861c5288ca69c6ca6ca6519c 100644 (file)
--- a/src/soc/fu/branch/test/test_pipe_caller.py
+++ b/src/soc/fu/branch/test/test_pipe_caller.py
@@ -47,8 +47,6 @@ def get_rec_width(rec):
 # massively. Before, it took around 1 minute on my computer, now it
 # takes around 3 seconds
 
-test_data = []
-
 
 def get_cu_inputs(dec2, sim):
     """naming (res) must conform to BranchFunctionUnit input regspec
@@ -83,6 +81,7 @@ def get_cu_inputs(dec2, sim):
 
 
 class BranchTestCase(FHDLTestCase):
+    test_data = []
     def __init__(self, name):
         super().__init__(name)
         self.test_name = name
@@ -91,7 +90,7 @@ class BranchTestCase(FHDLTestCase):
                         initial_sprs=None, initial_cr=0):
         tc = TestCase(prog, self.test_name,
                       initial_regs, initial_sprs, initial_cr)
-        test_data.append(tc)
+        self.test_data.append(tc)
 
     def test_unconditional(self):
         choices = ["b", "ba", "bl", "bla"]
@@ -261,7 +260,7 @@ class TestRunner(FHDLTestCase):
 if __name__ == "__main__":
     unittest.main(exit=False)
     suite = unittest.TestSuite()
-    suite.addTest(TestRunner(test_data))
+    suite.addTest(TestRunner(BranchTestCase.test_data))
 
     runner = unittest.TextTestRunner()
     runner.run(suite)

diff --git a/src/soc/fu/compunits/test/test_branch_compunit.py b/src/soc/fu/compunits/test/test_branch_compunit.py
index 9d4503ced6f44f89b3cbef5fa115b57ddefef2cc..dbcd0f656df8b026b2927e9db8ea4c42394d44a5 100644 (file)
--- a/src/soc/fu/compunits/test/test_branch_compunit.py
+++ b/src/soc/fu/compunits/test/test_branch_compunit.py
@@ -3,7 +3,6 @@ from soc.decoder.power_enums import (XER_bits, Function, spr_dict, SPR)
 
 # XXX bad practice: use of global variables
 from soc.fu.branch.test.test_pipe_caller import BranchTestCase, get_cu_inputs
-from soc.fu.branch.test.test_pipe_caller import test_data
 
 from soc.fu.compunits.compunits import BranchFunctionUnit
 from soc.fu.compunits.test.test_compunit import TestRunner
@@ -59,7 +58,7 @@ class BranchTestRunner(TestRunner):
 if __name__ == "__main__":
     unittest.main(exit=False)
     suite = unittest.TestSuite()
-    suite.addTest(BranchTestRunner(test_data))
+    suite.addTest(BranchTestRunner(BranchTestCase.test_data))
 
     runner = unittest.TextTestRunner()
     runner.run(suite)

diff --git a/src/soc/simple/test/test_core.py b/src/soc/simple/test/test_core.py
index 564c6f3b751e753e3c68781c5baa0450c94e1ee4..713da17d5c189aefe376c7fa89c6ba9cc4526932 100644 (file)
--- a/src/soc/simple/test/test_core.py
+++ b/src/soc/simple/test/test_core.py
@@ -230,9 +230,9 @@ if __name__ == "__main__":
     unittest.main(exit=False)
     suite = unittest.TestSuite()
     suite.addTest(TestRunner(CRTestCase.test_data))
-    #suite.addTest(TestRunner(ShiftRotTestCase.test_data))
-    #suite.addTest(TestRunner(LogicalTestCase.test_data))
-    #suite.addTest(TestRunner(ALUTestCase.test_data))
+    suite.addTest(TestRunner(ShiftRotTestCase.test_data))
+    suite.addTest(TestRunner(LogicalTestCase.test_data))
+    suite.addTest(TestRunner(ALUTestCase.test_data))
 
     runner = unittest.TextTestRunner()
     runner.run(suite)