summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2017-11-27 19:04:15 -0800
committerGabe Black <gabeblack@google.com>2017-11-28 11:00:32 +0000
commitd92e96732966ee48db3f8283367c0a1ffd84c1a7 (patch)
tree3ff6390986b66a79fb6804f8911f4944db69cb34 /src
parent60e165116b7785bc612d8ef5c9d22af7fe84e92a (diff)
downloadgem5-d92e96732966ee48db3f8283367c0a1ffd84c1a7.tar.xz
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>
Diffstat (limited to 'src')
-rw-r--r--src/base/SConscript2
-rw-r--r--src/base/bituniontest.cc (renamed from src/unittest/bituniontest.cc)0
-rw-r--r--src/unittest/SConscript1
3 files changed, 2 insertions, 1 deletions
diff --git a/src/base/SConscript b/src/base/SConscript
index 7aa93f504..13c1ffff5 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -76,6 +76,8 @@ Source('loader/symtab.cc')
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
index 1f24e7e66..1f24e7e66 100644
--- a/src/unittest/bituniontest.cc
+++ b/src/base/bituniontest.cc
diff --git a/src/unittest/SConscript b/src/unittest/SConscript
index cca3336b2..37529e3fe 100644
--- a/src/unittest/SConscript
+++ b/src/unittest/SConscript
@@ -32,7 +32,6 @@ Import('*')
Source('unittest.cc')
-GTest('bituniontest', 'bituniontest.cc')
UnitTest('bitvectest', 'bitvectest.cc')
UnitTest('circlebuf', 'circlebuf.cc')
UnitTest('cprintftest', 'cprintftest.cc')