[llvm-commits] [llvm] r105355 - in /llvm/trunk: unittests/Makefile.unittest utils/unittest/UnitTestMain/Makefile utils/unittest/googletest/Makefile utils/unittest/googletest/README.LLVM

[Benjamin Kramer]

Author: d0k
Date: Wed Jun  2 17:02:57 2010
New Revision: 105355

URL: http://llvm.org/viewvc/llvm-project?rev=105355&view=rev
Log:
Update Readme and Makefiles for the new gtest.

Modified:
    llvm/trunk/unittests/Makefile.unittest
    llvm/trunk/utils/unittest/UnitTestMain/Makefile
    llvm/trunk/utils/unittest/googletest/Makefile
    llvm/trunk/utils/unittest/googletest/README.LLVM

Modified: llvm/trunk/unittests/Makefile.unittest
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Makefile.unittest?rev=105355&r1=105354&r2=105355&view=diff
==============================================================================
--- llvm/trunk/unittests/Makefile.unittest (original)
+++ llvm/trunk/unittests/Makefile.unittest Wed Jun  2 17:02:57 2010
@@ -23,10 +23,6 @@
 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
 
 TESTLIBS = -lGoogleTest -lUnitTestMain
 

Modified: llvm/trunk/utils/unittest/UnitTestMain/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/UnitTestMain/Makefile?rev=105355&r1=105354&r2=105355&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/UnitTestMain/Makefile (original)
+++ llvm/trunk/utils/unittest/UnitTestMain/Makefile Wed Jun  2 17:02:57 2010
@@ -18,9 +18,5 @@
 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

Modified: llvm/trunk/utils/unittest/googletest/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/googletest/Makefile?rev=105355&r1=105354&r2=105355&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/googletest/Makefile (original)
+++ llvm/trunk/utils/unittest/googletest/Makefile Wed Jun  2 17:02:57 2010
@@ -21,11 +21,6 @@
 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

Modified: llvm/trunk/utils/unittest/googletest/README.LLVM
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/googletest/README.LLVM?rev=105355&r1=105354&r2=105355&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/googletest/README.LLVM (original)
+++ llvm/trunk/utils/unittest/googletest/README.LLVM Wed Jun  2 17:02:57 2010
@@ -7,8 +7,8 @@
 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 @@
 # 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