Andreas Sandberg has submitted this change and it was merged. (
https://gem5-review.googlesource.com/6623 )
Change subject: scons: Make sure GTests have the right environment variables
......................................................................
scons: Make sure GTests have the right environment variables
SCons currently scrubs the environment variables used by GTests too
aggressively. This breaks systems where libraries are installed in
non-standard locations that need to be specified in
LD_LIBRARY_PATH. Run said tests in the gtest_env SCons environment
which white-lists the important environment variables.
Change-Id: I5fc8fb5e51f09644dc976ee97b21c78ab349bf7d
Signed-off-by: Andreas Sandberg <andreas.sandb...@arm.com>
Reviewed-by: Jack Travaglini <giacomo.travagl...@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/6623
Reviewed-by: Gabe Black <gabebl...@google.com>
---
M src/SConscript
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Gabe Black: Looks good to me, approved
Andreas Sandberg: Looks good to me, approved
diff --git a/src/SConscript b/src/SConscript
index 7cd7116..57a2d96 100755
--- a/src/SConscript
+++ b/src/SConscript
@@ -1102,7 +1102,7 @@
test.dir.File('%s.%s' % (test.target, label)), test_objs))
gtest_target = Dir(new_env['BUILDDIR']).File('unittests.%s' % label)
- AlwaysBuild(Command(gtest_target, gtests, gtests))
+ AlwaysBuild(gtest_env.Command(gtest_target, gtests, gtests))
progname = exename
if strip:
--
To view, visit https://gem5-review.googlesource.com/6623
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I5fc8fb5e51f09644dc976ee97b21c78ab349bf7d
Gerrit-Change-Number: 6623
Gerrit-PatchSet: 2
Gerrit-Owner: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Assignee: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
