Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/50067 )
Change subject: scons: Change how the test object file suffix is applied.
......................................................................
scons: Change how the test object file suffix is applied.
This had been done by prepending the letter "t" to the suffix, with the
intention of turning a suffix like ".o" to ".to". Unfortunately SCons
stores both the actual suffix and the "." in that variable, so what we
ended up with was ".o" => "t.o", so test.o would become testt.o.
This change updates that logic to prepend a ".t" in front of the
existing suffix, skipping over it's first character which is assumed to
be a ".".
Change-Id: Id8c5f893413284868c2dc2a1a5e879b86790ed76
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/50067
Reviewed-by: Bobby R. Bruce <[email protected]>
Maintainer: Bobby R. Bruce <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/SConscript
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/SConscript b/src/SConscript
index 838c3cd..db11f44 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -541,8 +541,8 @@
@classmethod
def declare_all(cls, env):
env = env.Clone()
- env['OBJSUFFIX'] = 't' + env['OBJSUFFIX']
- env['SHOBJSUFFIX'] = 't' + env['SHOBJSUFFIX']
+ env['OBJSUFFIX'] = '.t' + env['OBJSUFFIX'][1:]
+ env['SHOBJSUFFIX'] = '.t' + env['SHOBJSUFFIX'][1:]
env.Append(LIBS=env['GTEST_LIBS'])
env.Append(CPPFLAGS=env['GTEST_CPPFLAGS'])
env['GTEST_LIB_SOURCES'] = Source.all.with_tag(env, 'gtest lib')
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/50067
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Id8c5f893413284868c2dc2a1a5e879b86790ed76
Gerrit-Change-Number: 50067
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
