Move all of the GoogleTest files back to the same locations they occupy

externally to simplify our integration of GoogleTest into LLVM. Also,
build the single source file gtest-all.cc instead of the individual
source files as we don't expect these to change and thus gain nothing
from increased incrementality in compiles.

This makes our standard build of googletest exactly like upstream's
recommended build and the sanitizer's build. It also simplifies the
steps of importing a new version should we ever want one.

llvm-svn: 194801

11 files changed, 15 insertions, 26 deletions

diff --git a/llvm/utils/unittest/googletest/Makefile b/llvm/utils/unittest/googletest/Makefile
index bf736704f54..3d85e7da0ba 100644
--- a/llvm/utils/unittest/googletest/Makefile
+++ b/llvm/utils/unittest/googletest/Makefile
@@ -19,6 +19,7 @@ REQUIRES_RTTI = 1
 # unittests/Makefile.unittest and ../UnitTestMain/Makefile; ensure that any
 # changes are made to both.
 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
+CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest
 CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS)
 CPP.Flags += -DGTEST_HAS_RTTI=0
 # libstdc++'s TR1 <tuple> header depends on RTTI and uses C++'0x features not
@@ -36,6 +37,6 @@ endif
 
 NO_INSTALL = 1
 
-SOURCES = $(filter-out gtest-all.cc, $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cc)))
+SOURCES = src/gtest-all.cc
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/utils/unittest/googletest/README.LLVM b/llvm/utils/unittest/googletest/README.LLVM
index 3565a3280e4..1a6f0f59f1d 100644
--- a/llvm/utils/unittest/googletest/README.LLVM
+++ b/llvm/utils/unittest/googletest/README.LLVM
@@ -10,23 +10,11 @@ Cleaned up as follows:
 $ rm -f aclocal* CMakeLists.txt configure* Makefile* CHANGES CONTRIBUTORS README
 $ rm -rf build-aux cmake codegear fused-src m4 make msvc samples scripts test xcode
 $ rm -f `find . -name \*\.pump`
+$ rm -f src/gtest_main.cc
 
-# Move all the source files to the current directory
-$ mv src/* .
-$ rmdir src
-
-# Move extra headers 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-all.cc
-$ perl -pi -e 's|^#include "src/|#include "gtest/internal/|' *.cc
-
-$ rm -f gtest_main.cc
-
+# Put the license in the consistent place for LLVM.
 $ mv COPYING LICENSE.TXT
 
-
 Modified as follows:
 * To GTestStreamToHelper in include/gtest/internal/gtest-internal.h,
   added the ability to stream with raw_os_ostream.
diff --git a/llvm/utils/unittest/googletest/gtest-all.cc b/llvm/utils/unittest/googletest/src/gtest-all.cc
index 97753e5b9d5..0a9cee52233 100644
--- a/llvm/utils/unittest/googletest/gtest-all.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-all.cc
@@ -39,10 +39,10 @@
 #include "gtest/gtest.h"
 
 // The following lines pull in the real gtest *.cc files.
-#include "gtest.cc"
-#include "gtest-death-test.cc"
-#include "gtest-filepath.cc"
-#include "gtest-port.cc"
-#include "gtest-printers.cc"
-#include "gtest-test-part.cc"
-#include "gtest-typed-test.cc"
+#include "src/gtest.cc"
+#include "src/gtest-death-test.cc"
+#include "src/gtest-filepath.cc"
+#include "src/gtest-port.cc"
+#include "src/gtest-printers.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/src/gtest-death-test.cc
index bf7e32c2383..82453f20fd5 100644
--- a/llvm/utils/unittest/googletest/gtest-death-test.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-death-test.cc
@@ -63,7 +63,7 @@
 // prevent a user from accidentally including gtest-internal-inl.h in
 // his code.
 #define GTEST_IMPLEMENTATION_ 1
-#include "gtest/internal/gtest-internal-inl.h"
+#include "src/gtest-internal-inl.h"
 #undef GTEST_IMPLEMENTATION_
 
 namespace testing {
diff --git a/llvm/utils/unittest/googletest/gtest-filepath.cc b/llvm/utils/unittest/googletest/src/gtest-filepath.cc
index ad1bab8e9f5..ad1bab8e9f5 100644
--- a/llvm/utils/unittest/googletest/gtest-filepath.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-filepath.cc
diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal-inl.h b/llvm/utils/unittest/googletest/src/gtest-internal-inl.h
index 6554cfc07e6..6554cfc07e6 100644
--- a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal-inl.h
+++ b/llvm/utils/unittest/googletest/src/gtest-internal-inl.h
diff --git a/llvm/utils/unittest/googletest/gtest-port.cc b/llvm/utils/unittest/googletest/src/gtest-port.cc
index 3c32ff1ac1e..745956247a6 100644
--- a/llvm/utils/unittest/googletest/gtest-port.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-port.cc
@@ -62,7 +62,7 @@
 // prevent a user from accidentally including gtest-internal-inl.h in
 // his code.
 #define GTEST_IMPLEMENTATION_ 1
-#include "gtest/internal/gtest-internal-inl.h"
+#include "src/gtest-internal-inl.h"
 #undef GTEST_IMPLEMENTATION_
 
 namespace testing {
diff --git a/llvm/utils/unittest/googletest/gtest-printers.cc b/llvm/utils/unittest/googletest/src/gtest-printers.cc
index 205a39425f0..205a39425f0 100644
--- a/llvm/utils/unittest/googletest/gtest-printers.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-printers.cc
diff --git a/llvm/utils/unittest/googletest/gtest-test-part.cc b/llvm/utils/unittest/googletest/src/gtest-test-part.cc
index 161278027d0..5ddc67c1c9e 100644
--- a/llvm/utils/unittest/googletest/gtest-test-part.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-test-part.cc
@@ -39,7 +39,7 @@
 // prevent a user from accidentally including gtest-internal-inl.h in
 // his code.
 #define GTEST_IMPLEMENTATION_ 1
-#include "gtest/internal/gtest-internal-inl.h"
+#include "src/gtest-internal-inl.h"
 #undef GTEST_IMPLEMENTATION_
 
 namespace testing {
diff --git a/llvm/utils/unittest/googletest/gtest-typed-test.cc b/llvm/utils/unittest/googletest/src/gtest-typed-test.cc
index a5cc88f9205..a5cc88f9205 100644
--- a/llvm/utils/unittest/googletest/gtest-typed-test.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-typed-test.cc
diff --git a/llvm/utils/unittest/googletest/gtest.cc b/llvm/utils/unittest/googletest/src/gtest.cc
index eb5c68c272c..9891928048a 100644
--- a/llvm/utils/unittest/googletest/gtest.cc
+++ b/llvm/utils/unittest/googletest/src/gtest.cc
@@ -129,7 +129,7 @@
 // prevent a user from accidentally including gtest-internal-inl.h in
 // his code.
 #define GTEST_IMPLEMENTATION_ 1
-#include "gtest/internal/gtest-internal-inl.h"
+#include "src/gtest-internal-inl.h"
 #undef GTEST_IMPLEMENTATION_
 
 #if GTEST_OS_WINDOWS