projects
/
gem5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3fd4251
)
tests: Fix building unit tests.
author
Gabe Black
<gblack@eecs.umich.edu>
Tue, 10 Apr 2012 06:20:30 +0000
(23:20 -0700)
committer
Gabe Black
<gblack@eecs.umich.edu>
Tue, 10 Apr 2012 06:20:30 +0000
(23:20 -0700)
Unit tests shouldn't build in gem5's main function because they have thier
own.
src/SConscript
patch
|
blob
|
history
diff --git
a/src/SConscript
b/src/SConscript
index 5a7d7d29dee95941213559e1eef23d27ecc637fc..9f11a45f3de5bf2ebb6480813740f5798d8f0339 100755
(executable)
--- a/
src/SConscript
+++ b/
src/SConscript
@@
-901,7
+901,7
@@
def makeEnv(label, objsfx, strip = False, **kwargs):
test_sources = Source.get(**flags)
test_objs = [ make_obj(s, static=True) for s in test_sources ]
testname = "unittest/%s.%s" % (test.target, label)
- new_env.Program(testname,
main_objs +
test_objs + static_objs)
+ new_env.Program(testname, test_objs + static_objs)
progname = exename
if strip: