diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2010-06-02 22:02:57 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2010-06-02 22:02:57 +0000 |
| commit | 9cb0274182e4f52ffeb586252627e5b6899fe837 (patch) | |
| tree | 7477364cefdf1f6b9dd560ff6e35f3a338588f92 /llvm/utils/unittest | |
| parent | bfb492d6c8d99562ce92f1e4152d5a7b36f5c1fa (diff) | |
| download | bcm5719-llvm-9cb0274182e4f52ffeb586252627e5b6899fe837.tar.gz bcm5719-llvm-9cb0274182e4f52ffeb586252627e5b6899fe837.zip | |
Update Readme and Makefiles for the new gtest.
llvm-svn: 105355
Diffstat (limited to 'llvm/utils/unittest')
| -rw-r--r-- | llvm/utils/unittest/UnitTestMain/Makefile | 4 | ||||
| -rw-r--r-- | llvm/utils/unittest/googletest/Makefile | 5 | ||||
| -rw-r--r-- | llvm/utils/unittest/googletest/README.LLVM | 6 |
3 files changed, 2 insertions, 13 deletions
diff --git a/llvm/utils/unittest/UnitTestMain/Makefile b/llvm/utils/unittest/UnitTestMain/Makefile index 5c1004942db..16ac38b5688 100644 --- a/llvm/utils/unittest/UnitTestMain/Makefile +++ b/llvm/utils/unittest/UnitTestMain/Makefile @@ -18,9 +18,5 @@ REQUIRES_RTTI = 1 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include 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 -# supported by Clang, so force googletest to use its own tuple implementation. -# When we import googletest >=1.4.0, we can drop this line. -CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0 include $(LEVEL)/Makefile.common diff --git a/llvm/utils/unittest/googletest/Makefile b/llvm/utils/unittest/googletest/Makefile index 1ec979d961e..b6e3e68a330 100644 --- a/llvm/utils/unittest/googletest/Makefile +++ b/llvm/utils/unittest/googletest/Makefile @@ -21,11 +21,6 @@ REQUIRES_RTTI = 1 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include 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 -# supported by Clang, so force googletest to use its own tuple implementation. -# When we import googletest >=1.4.0, we can drop this line. -CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0 - ifeq ($(HOST_OS),MingW) CPP.Flags += -DGTEST_OS_WINDOWS=1 diff --git a/llvm/utils/unittest/googletest/README.LLVM b/llvm/utils/unittest/googletest/README.LLVM index e907a5e6ea2..7a72cbcb869 100644 --- a/llvm/utils/unittest/googletest/README.LLVM +++ b/llvm/utils/unittest/googletest/README.LLVM @@ -7,8 +7,8 @@ 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 aclocal* CMakeLists.txt configure* Makefile* CHANGES CONTRIBUTORS README +$ rm -rf build-aux codegear fused-src m4 make msvc samples scripts test xcode $ rm -f `find . -name \*\.pump` # Move all the source files to the current directory @@ -21,8 +21,6 @@ $ mv *.h include/gtest/internal/ # Update paths to the included files $ perl -pi -e 's|^#include "src/|#include "gtest/internal/|' *.cc -$ rm -f gtest-all.cc gtest_main.cc - $ mv COPYING LICENSE.TXT |
