tests: Move the bituniontest to be alongside the bitunion header.

Change-Id: I7c1a49c41672a1108fcf67c5505b0441f90588ef
Reviewed-on: https://gem5-review.googlesource.com/6142
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
diff --git a/src/base/SConscript b/src/base/SConscript
index 7aa93f5..13c1fff 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -76,6 +76,8 @@
 
 Source('stats/text.cc')
 
+GTest('bituniontest', 'bituniontest.cc')
+
 DebugFlag('Annotate', "State machine annotation debugging")
 DebugFlag('AnnotateQ', "State machine annotation queue debugging")
 DebugFlag('AnnotateVerbose', "Dump all state machine annotation details")
diff --git a/src/unittest/bituniontest.cc b/src/base/bituniontest.cc
similarity index 100%
rename from src/unittest/bituniontest.cc
rename to src/base/bituniontest.cc
diff --git a/src/unittest/SConscript b/src/unittest/SConscript
index cca3336..37529e3 100644
--- a/src/unittest/SConscript
+++ b/src/unittest/SConscript
@@ -32,7 +32,6 @@
 
 Source('unittest.cc')
 
-GTest('bituniontest', 'bituniontest.cc')
 UnitTest('bitvectest', 'bitvectest.cc')
 UnitTest('circlebuf', 'circlebuf.cc')
 UnitTest('cprintftest', 'cprintftest.cc')