summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2017-12-04 19:46:26 -0800
committerGabe Black <gabeblack@google.com>2017-12-12 19:47:52 +0000
commitc849dd804a7c43ee51a353b8ca4e3c011913dc72 (patch)
tree0d4603548db61cc0f739881482936b235dc0fa4a /src
parent260c23f930b802e939f5cbc6230cdc61fdec8f27 (diff)
downloadgem5-c849dd804a7c43ee51a353b8ca4e3c011913dc72.tar.xz
tests: Move the cprintftest unit test into src/base.
That way it will live alongside the code it tests. Change-Id: I00baad2206870a4619b7cee792a1d4c303dad04d Reviewed-on: https://gem5-review.googlesource.com/6324 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src')
-rw-r--r--src/base/SConscript1
-rw-r--r--src/base/cprintftest.cc (renamed from src/unittest/cprintftest.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 881a38ac5..bbdc85f75 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -41,6 +41,7 @@ Source('imgwriter.cc')
Source('bmpwriter.cc')
Source('callback.cc')
Source('cprintf.cc', add_tags='gtest lib')
+GTest('cprintftest', 'cprintftest.cc')
Source('debug.cc')
if env['USE_FENV']:
Source('fenv.c')
diff --git a/src/unittest/cprintftest.cc b/src/base/cprintftest.cc
index 86694ed83..86694ed83 100644
--- a/src/unittest/cprintftest.cc
+++ b/src/base/cprintftest.cc
diff --git a/src/unittest/SConscript b/src/unittest/SConscript
index 1a4b8bb20..21b592e6c 100644
--- a/src/unittest/SConscript
+++ b/src/unittest/SConscript
@@ -33,7 +33,6 @@ Import('*')
Source('unittest.cc')
UnitTest('circlebuf', 'circlebuf.cc')
-GTest('cprintftest', 'cprintftest.cc')
UnitTest('cprintftime', 'cprintftime.cc')
UnitTest('pixeltest', 'pixeltest.cc')
UnitTest('initest', 'initest.cc')