[llvm-branch-commits] [cfe-branch] r155112 - in /cfe/branches/tooling/test: CMakeLists.txt Tooling/clang-check-pwd.cpp Tooling/clang-check.cpp

[Manuel Klimek]

Author: klimek
Date: Thu Apr 19 05:01:42 2012
New Revision: 155112

URL: http://llvm.org/viewvc/llvm-project?rev=155112&view=rev
Log:
Updated changes from mainline which had tree conflicts.


Added:
    cfe/branches/tooling/test/CMakeLists.txt   (contents, props changed)
      - copied, changed from r155111, cfe/trunk/test/CMakeLists.txt
    cfe/branches/tooling/test/Tooling/clang-check-pwd.cpp   (props changed)
      - copied unchanged from r155111, cfe/trunk/test/Tooling/clang-check-pwd.cpp
    cfe/branches/tooling/test/Tooling/clang-check.cpp   (props changed)
      - copied unchanged from r155111, cfe/trunk/test/Tooling/clang-check.cpp

Copied: cfe/branches/tooling/test/CMakeLists.txt (from r155111, cfe/trunk/test/CMakeLists.txt)
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/tooling/test/CMakeLists.txt?p2=cfe/branches/tooling/test/CMakeLists.txt&p1=cfe/trunk/test/CMakeLists.txt&r1=155111&r2=155112&rev=155112&view=diff
==============================================================================
--- cfe/trunk/test/CMakeLists.txt (original)
+++ cfe/branches/tooling/test/CMakeLists.txt Thu Apr 19 05:01:42 2012
@@ -111,7 +111,7 @@
   add_dependencies(clang-test clang-test.deps)
   add_dependencies(clang-test.deps
                  clang clang-headers c-index-test diagtool arcmt-test c-arcmt-test
-                 clang-check
+                 clang-check remove-cstr-calls
                  )
 
 endif()

Propchange: cfe/branches/tooling/test/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cfe/branches/tooling/test/CMakeLists.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cfe/branches/tooling/test/CMakeLists.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 19 05:01:42 2012
@@ -0,0 +1,2 @@
+/cfe/branches/type-system-rewrite/test/CMakeLists.txt:134693-134817
+/cfe/trunk/test/SemaTemplate/test/CMakeLists.txt:126920

Propchange: cfe/branches/tooling/test/CMakeLists.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: cfe/branches/tooling/test/Tooling/clang-check-pwd.cpp
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: cfe/branches/tooling/test/Tooling/clang-check-pwd.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 19 05:01:42 2012
@@ -0,0 +1,2 @@
+/cfe/branches/type-system-rewrite/test/Tooling/clang-check-pwd.cpp:134693-134817
+/cfe/trunk/test/SemaTemplate/test/Tooling/clang-check-pwd.cpp:126920

Propchange: cfe/branches/tooling/test/Tooling/clang-check.cpp
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: cfe/branches/tooling/test/Tooling/clang-check.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 19 05:01:42 2012
@@ -0,0 +1,2 @@
+/cfe/branches/type-system-rewrite/test/Tooling/clang-check.cpp:134693-134817
+/cfe/trunk/test/SemaTemplate/test/Tooling/clang-check.cpp:126920