util: Make the googletest library available to the m5 utility.

The library will be available for the abis so that they can test
their unique call mechanisms, and also the main/native environment for
testing shared components.

Build instructions for things that should be built natively, ie unit
tests for common components, should go in the new SConscript.native.

Change-Id: I4a84b2cf2165c92dfb1b6d903b18b45e4cba1352
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27559
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/util/m5/SConstruct b/util/m5/SConstruct
index e539d8d98e313a7f02332c7593fdcc391f15bfea..47d437b6719befacc8e66d343a204c9c76ad8ebd 100644 (file)
--- a/util/m5/SConstruct
+++ b/util/m5/SConstruct
@@ -28,8 +28,13 @@ import os
 
 main = Environment()
 
+gem5_root = Dir('..').Dir('..')
+
 # Includes which are shared with gem5 itself.
-common_include = Dir('..').Dir('..').Dir('include')
+common_include = gem5_root.Dir('include')
+
+ext_dir = gem5_root.Dir('ext')
+googletest_dir = ext_dir.Dir('googletest')
 
 src_dir = Dir('src')
 build_dir = Dir('build')
@@ -45,12 +50,6 @@ main.Append(CPPPATH=[ common_include ])
 # Propogate the environment's PATH setting.
 main['ENV']['PATH'] = os.environ['PATH']
 
-main['CC'] = '${CROSS_COMPILE}gcc'
-main['CXX'] = '${CROSS_COMPILE}g++'
-main['AS'] = '${CROSS_COMPILE}as'
-main['LD'] = '${CROSS_COMPILE}ld'
-main['AR'] = '${CROSS_COMPILE}ar'
-
 # Detect some dependencies of some forms of the m5 utility/library.
 main['HAVE_JAVA'] = all(key in main for key in ('JAVAC', 'JAR'))
 main['HAVE_PKG_CONFIG'] = main.Detect('pkg-config') is not None
@@ -62,6 +61,35 @@ main.SConsignFile(os.path.join(abspath(build_dir), 'sconsign'))
 # Use soft links instead of hard links when setting up a build directory.
 main.SetOption('duplicate', 'soft-copy')
 
+def GTest(env, name, *srcs, **kwargs):
+    if 'GTEST_ENV' not in env:
+        gtest_env = env.Clone(OBJSUFFIX='.to')
+        gtest_env.Append(CPPFLAGS=[ '${GTEST_CPPFLAGS}' ])
+        gtest_env.Append(LIBS=[ '${GTEST_LIBS}' ])
+        env['GTEST_ENV'] = gtest_env
+
+    if not srcs:
+        srcs = [ name + '.cc', name + '.test.cc' ]
+    env['GTEST_ENV'].Program('test/%s' % name, srcs, **kwargs)
+
+main.AddMethod(GTest)
+
+native = main.Clone()
+native_dir = build_dir.Dir('native')
+
+# Bring in the googletest sources.
+native.SConscript(googletest_dir.File('SConscript'),
+        variant_dir=native_dir.Dir('googletest'), exports={ 'main': native })
+
+native.SConscript(src_dir.File('SConscript.native'),
+        variant_dir=native_dir, exports={ 'env': native })
+
+main['CC'] = '${CROSS_COMPILE}gcc'
+main['CXX'] = '${CROSS_COMPILE}g++'
+main['AS'] = '${CROSS_COMPILE}as'
+main['LD'] = '${CROSS_COMPILE}ld'
+main['AR'] = '${CROSS_COMPILE}ar'
+
 class CallType(object):
     def __init__(self, name):
         self.name = name
@@ -110,5 +138,9 @@ for root, dirs, files in os.walk(abspath(src_dir)):
         # Once all the options have been configured, set up build targets for
         # this abi.
         abi_dir = build_dir.Dir(env.subst('${ABI}'))
+        # Bring in the googletest sources.
+        env.SConscript(googletest_dir.File('SConscript'),
+                variant_dir=abi_dir.Dir('googletest'),
+                exports={ 'main': env })
         env.SConscript(src_dir.File('SConscript'),
                        variant_dir=abi_dir, exports='env')

diff --git a/util/m5/src/SConscript.native b/util/m5/src/SConscript.native
new file mode 100644 (file)
index 0000000..85d38c2
--- /dev/null
+++ b/util/m5/src/SConscript.native
@@ -0,0 +1,26 @@
+# Copyright 2020 Google, Inc.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('*')