Source('unittest.cc')
-UnitTest('bituniontest', 'bituniontest.cc')
-UnitTest('bitvectest', 'bitvectest.cc')
-UnitTest('circlebuf', 'circlebuf.cc')
-UnitTest('cprintftest', 'cprintftest.cc')
-UnitTest('cprintftime', 'cprintftest.cc')
-UnitTest('fbtest', 'fbtest.cc')
-UnitTest('initest', 'initest.cc')
+UnitTest('cprintftime', 'cprintftime.cc')
UnitTest('nmtest', 'nmtest.cc')
-UnitTest('rangemaptest', 'rangemaptest.cc')
UnitTest('refcnttest', 'refcnttest.cc')
UnitTest('strnumtest', 'strnumtest.cc')
-UnitTest('trietest', 'trietest.cc')
-stattest_py = PySource('m5', 'stattestmain.py', skip_lib=True)
-stattest_swig = SwigSource('_m5', 'stattest.i', skip_lib=True)
-UnitTest('stattest', 'stattest.cc', stattest_py, stattest_swig, main=True)
+stattest_py = PySource('m5', 'stattestmain.py', tags='stattest')
+UnitTest('stattest', 'stattest.cc', with_tag('stattest'), main=True)
UnitTest('symtest', 'symtest.cc')
UnitTest('tokentest', 'tokentest.cc')