From 22df200727996b3bc6f34aefa2e884c9969dd284 Mon Sep 17 00:00:00 2001 From: Misha Brukman Date: Thu, 1 Jan 2009 02:05:43 +0000 Subject: [PATCH] * Removed gtest-all.cc; .cc files including other .cc files is weird * Removed gtest_main.cc: we have our own main() elsewhere * Simplified the Makefile as we don't need SOURCES * Moved the internal header to gtest/internal/ * Simplified the Makefile to remove -I param to CPP.Flags * Updated README.LLVM with all the steps I took to massage GTest to work in LLVM so far llvm-svn: 61540 --- llvm/utils/unittest/googletest/Makefile | 2 - llvm/utils/unittest/googletest/README.LLVM | 13 ++++++ llvm/utils/unittest/googletest/gtest-all.cc | 41 ------------------- .../unittest/googletest/gtest-death-test.cc | 2 +- .../unittest/googletest/gtest-test-part.cc | 2 +- llvm/utils/unittest/googletest/gtest.cc | 2 +- llvm/utils/unittest/googletest/gtest_main.cc | 39 ------------------ .../gtest/internal}/gtest-internal-inl.h | 0 8 files changed, 16 insertions(+), 85 deletions(-) delete mode 100644 llvm/utils/unittest/googletest/gtest-all.cc delete mode 100644 llvm/utils/unittest/googletest/gtest_main.cc rename llvm/utils/unittest/googletest/{ => include/gtest/internal}/gtest-internal-inl.h (100%) diff --git a/llvm/utils/unittest/googletest/Makefile b/llvm/utils/unittest/googletest/Makefile index d73e85a54333..2d162a63801e 100644 --- a/llvm/utils/unittest/googletest/Makefile +++ b/llvm/utils/unittest/googletest/Makefile @@ -12,8 +12,6 @@ include $(LEVEL)/Makefile.config LIBRARYNAME = GoogleTest BUILD_ARCHIVE = 1 -SOURCES = gtest-all.cc -CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/ CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/ CPP.Flags += -Wno-missing-field-initializers -Wno-variadic-macros diff --git a/llvm/utils/unittest/googletest/README.LLVM b/llvm/utils/unittest/googletest/README.LLVM index 38a77c01787c..4b720478daa7 100644 --- a/llvm/utils/unittest/googletest/README.LLVM +++ b/llvm/utils/unittest/googletest/README.LLVM @@ -5,10 +5,23 @@ This directory contains Google Test 1.2.1, with all elements removed except for the actual source code, to minimize the addition to the LLVM distribution. Cleaned up as follows: + +# Remove all the unnecessary files and directories $ rm -f aclocal* configure* Makefile* CHANGES CONTRIBUTORS README $ rm -rf build-aux m4 make msvc samples scons scripts test xcode $ rm -f `find . -name \*\.pump` + +# Move all the source files to the current directory $ mv src/* . $ rmdir src +# Move the extra header into the already-existing internal headers dir +$ mv *.h include/gtest/internal/ + +# Update paths to the included files +$ perl -pi -e 's|^#include "src/|#include "gtest/internal/|' *.cc + +# We have our own main() . +$ rm -f gtest_main.cc + For the license, see the file COPYING in this directory. diff --git a/llvm/utils/unittest/googletest/gtest-all.cc b/llvm/utils/unittest/googletest/gtest-all.cc deleted file mode 100644 index a67ea0fa0f3a..000000000000 --- a/llvm/utils/unittest/googletest/gtest-all.cc +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2008, 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. -// -// Author: mheule@google.com (Markus Heule) -// -// Google C++ Testing Framework (Google Test) -// -// Sometimes it's desirable to build Google Test by compiling a single file. -// This file serves this purpose. -#include "src/gtest.cc" -#include "src/gtest-death-test.cc" -#include "src/gtest-filepath.cc" -#include "src/gtest-port.cc" -#include "src/gtest-test-part.cc" -#include "src/gtest-typed-test.cc" diff --git a/llvm/utils/unittest/googletest/gtest-death-test.cc b/llvm/utils/unittest/googletest/gtest-death-test.cc index b667682fb982..617e3010f23a 100644 --- a/llvm/utils/unittest/googletest/gtest-death-test.cc +++ b/llvm/utils/unittest/googletest/gtest-death-test.cc @@ -49,7 +49,7 @@ // prevent a user from accidentally including gtest-internal-inl.h in // his code. #define GTEST_IMPLEMENTATION -#include "src/gtest-internal-inl.h" +#include "gtest/internal/gtest-internal-inl.h" #undef GTEST_IMPLEMENTATION namespace testing { diff --git a/llvm/utils/unittest/googletest/gtest-test-part.cc b/llvm/utils/unittest/googletest/gtest-test-part.cc index dcd30b25848b..2e80f21d3835 100644 --- a/llvm/utils/unittest/googletest/gtest-test-part.cc +++ b/llvm/utils/unittest/googletest/gtest-test-part.cc @@ -39,7 +39,7 @@ // prevent a user from accidentally including gtest-internal-inl.h in // his code. #define GTEST_IMPLEMENTATION -#include "src/gtest-internal-inl.h" +#include "gtest/internal/gtest-internal-inl.h" #undef GTEST_IMPLEMENTATION namespace testing { diff --git a/llvm/utils/unittest/googletest/gtest.cc b/llvm/utils/unittest/googletest/gtest.cc index a9ca334ac1dd..64dbb8418947 100644 --- a/llvm/utils/unittest/googletest/gtest.cc +++ b/llvm/utils/unittest/googletest/gtest.cc @@ -117,7 +117,7 @@ // prevent a user from accidentally including gtest-internal-inl.h in // his code. #define GTEST_IMPLEMENTATION -#include "src/gtest-internal-inl.h" +#include "gtest/internal/gtest-internal-inl.h" #undef GTEST_IMPLEMENTATION #ifdef GTEST_OS_WINDOWS diff --git a/llvm/utils/unittest/googletest/gtest_main.cc b/llvm/utils/unittest/googletest/gtest_main.cc deleted file mode 100644 index d20c02fdfb0a..000000000000 --- a/llvm/utils/unittest/googletest/gtest_main.cc +++ /dev/null @@ -1,39 +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. - -#include - -#include - -int main(int argc, char **argv) { - std::cout << "Running main() from gtest_main.cc\n"; - - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/llvm/utils/unittest/googletest/gtest-internal-inl.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal-inl.h similarity index 100% rename from llvm/utils/unittest/googletest/gtest-internal-inl.h rename to llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal-inl.h