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
diff --git a/llvm/utils/unittest/CMakeLists.txt b/llvm/utils/unittest/CMakeLists.txt
index 8bdfee1..fd1a048 100644
--- a/llvm/utils/unittest/CMakeLists.txt
+++ b/llvm/utils/unittest/CMakeLists.txt
@@ -14,6 +14,7 @@
# Where gtest's .h files can be found.
include_directories(
googletest/include
+ googletest
)
if(WIN32)
@@ -38,13 +39,7 @@
endif ()
add_llvm_library(gtest
- googletest/gtest.cc
- googletest/gtest-death-test.cc
- googletest/gtest-filepath.cc
- googletest/gtest-port.cc
- googletest/gtest-printers.cc
- googletest/gtest-test-part.cc
- googletest/gtest-typed-test.cc
+ googletest/src/gtest-all.cc
)
add_llvm_library(gtest_main
diff --git a/llvm/utils/unittest/googletest/Makefile b/llvm/utils/unittest/googletest/Makefile
index bf73670..3d85e7d 100644
--- a/llvm/utils/unittest/googletest/Makefile
+++ b/llvm/utils/unittest/googletest/Makefile
@@ -19,6 +19,7 @@
# 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 @@
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 3565a32..1a6f0f5 100644
--- a/llvm/utils/unittest/googletest/README.LLVM
+++ b/llvm/utils/unittest/googletest/README.LLVM
@@ -10,23 +10,11 @@
$ 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
similarity index 89%
rename from llvm/utils/unittest/googletest/gtest-all.cc
rename to llvm/utils/unittest/googletest/src/gtest-all.cc
index 97753e5..0a9cee5 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
similarity index 99%
rename from llvm/utils/unittest/googletest/gtest-death-test.cc
rename to llvm/utils/unittest/googletest/src/gtest-death-test.cc
index bf7e32c..82453f2 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
similarity index 100%
rename from llvm/utils/unittest/googletest/gtest-filepath.cc
rename to 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
similarity index 100%
rename from llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal-inl.h
rename to 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
similarity index 99%
rename from llvm/utils/unittest/googletest/gtest-port.cc
rename to llvm/utils/unittest/googletest/src/gtest-port.cc
index 3c32ff1..7459562 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
similarity index 100%
rename from llvm/utils/unittest/googletest/gtest-printers.cc
rename to 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
similarity index 98%
rename from llvm/utils/unittest/googletest/gtest-test-part.cc
rename to llvm/utils/unittest/googletest/src/gtest-test-part.cc
index 1612780..5ddc67c 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
similarity index 100%
rename from llvm/utils/unittest/googletest/gtest-typed-test.cc
rename to 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
similarity index 99%
rename from llvm/utils/unittest/googletest/gtest.cc
rename to llvm/utils/unittest/googletest/src/gtest.cc
index eb5c68c..9891928 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