diff options
author | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-12-03 11:37:51 +0000 |
---|---|---|
committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-12-06 11:52:57 +0000 |
commit | 202a4c37ee88e47c614a61db5fe0f134f9f6ea1a (patch) | |
tree | 204540a1eb55ea0f2d7cdf28139530c337b62326 /ext/googletest/test/gtest_no_test_unittest.cc | |
parent | 44551545affd785804a3dde8f0e88b3bcf9bf904 (diff) | |
download | gem5-202a4c37ee88e47c614a61db5fe0f134f9f6ea1a.tar.xz |
ext: Build googlemock with googletest
googlemock needs to be built together with googletest. This patch
is enabling it by doing the following things
* Moving googletest and googlemock under the same top level directory,
so that we have a single SConscript for building them.
This also matches googletest directory structure:
googletest
|_googletest
|_googlemock
* Adding a shared SConscript which is building gmock and gtest as libgtest
* Removing googletest/SConscript
Change-Id: I88accbdd2e80fb47efaa17819233371fbad6acaa
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/14696
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'ext/googletest/test/gtest_no_test_unittest.cc')
-rw-r--r-- | ext/googletest/test/gtest_no_test_unittest.cc | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/ext/googletest/test/gtest_no_test_unittest.cc b/ext/googletest/test/gtest_no_test_unittest.cc deleted file mode 100644 index 292599af8..000000000 --- a/ext/googletest/test/gtest_no_test_unittest.cc +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2006, Google Inc. -// All rights reserved. -// -// 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 Google Inc. 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. - -// Tests that a Google Test program that has no test defined can run -// successfully. -// -// Author: wan@google.com (Zhanyong Wan) - -#include "gtest/gtest.h" - -int main(int argc, char **argv) { - testing::InitGoogleTest(&argc, argv); - - // An ad-hoc assertion outside of all tests. - // - // This serves three purposes: - // - // 1. It verifies that an ad-hoc assertion can be executed even if - // no test is defined. - // 2. It verifies that a failed ad-hoc assertion causes the test - // program to fail. - // 3. We had a bug where the XML output won't be generated if an - // assertion is executed before RUN_ALL_TESTS() is called, even - // though --gtest_output=xml is specified. This makes sure the - // bug is fixed and doesn't regress. - EXPECT_EQ(1, 2); - - // The above EXPECT_EQ() should cause RUN_ALL_TESTS() to return non-zero. - return RUN_ALL_TESTS() ? 0 : 1; -} |