summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2017-12-03 01:59:39 -0800
committerGabe Black <gabeblack@google.com>2017-12-12 19:47:21 +0000
commit4e5f5e672b8e355c0a15d050fa7ea9a88acfb5cd (patch)
tree740f44d1e636ad1d09aa9477822bc1f46c999631
parentb031deda707e84abb68ba6f409910e0fad9f9a5f (diff)
downloadgem5-4e5f5e672b8e355c0a15d050fa7ea9a88acfb5cd.tar.xz
tests: Move the trietest unit test into base.
This puts it alongside trie.hh, the header file it tests. Change-Id: Id8ca0c1d68bdc01807c5ba4b51c0142b1221385d Reviewed-on: https://gem5-review.googlesource.com/6281 Maintainer: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-by: Brandon Potter <Brandon.Potter@amd.com>
-rw-r--r--src/base/SConscript1
-rw-r--r--src/base/trietest.cc (renamed from src/unittest/trietest.cc)0
-rw-r--r--src/unittest/SConscript1
3 files changed, 1 insertions, 1 deletions
diff --git a/src/base/SConscript b/src/base/SConscript
index efb77431d..881a38ac5 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -64,6 +64,7 @@ Source('statistics.cc')
Source('str.cc')
Source('time.cc')
Source('trace.cc')
+GTest('trietest', 'trietest.cc')
Source('types.cc')
Source('loader/aout_object.cc')
diff --git a/src/unittest/trietest.cc b/src/base/trietest.cc
index 154200973..154200973 100644
--- a/src/unittest/trietest.cc
+++ b/src/base/trietest.cc
diff --git a/src/unittest/SConscript b/src/unittest/SConscript
index b497ddbfd..361c215ac 100644
--- a/src/unittest/SConscript
+++ b/src/unittest/SConscript
@@ -41,7 +41,6 @@ UnitTest('nmtest', 'nmtest.cc')
UnitTest('rangemaptest', 'rangemaptest.cc')
UnitTest('refcnttest', 'refcnttest.cc')
UnitTest('strnumtest', 'strnumtest.cc')
-GTest('trietest', 'trietest.cc')
stattest_py = PySource('m5', 'stattestmain.py', tags='stattest')
UnitTest('stattest', 'stattest.cc', stattest_py, main=True)