diff options
Diffstat (limited to 'unittests')
-rw-r--r-- | unittests/AST/Makefile | 2 | ||||
-rw-r--r-- | unittests/ASTMatchers/Dynamic/Makefile | 2 | ||||
-rw-r--r-- | unittests/ASTMatchers/Makefile | 2 | ||||
-rw-r--r-- | unittests/CMakeLists.txt | 15 | ||||
-rw-r--r-- | unittests/Format/Makefile | 2 | ||||
-rw-r--r-- | unittests/Frontend/Makefile | 2 | ||||
-rw-r--r-- | unittests/Makefile | 6 | ||||
-rw-r--r-- | unittests/Sema/Makefile | 2 | ||||
-rw-r--r-- | unittests/Tooling/CMakeLists.txt | 2 | ||||
-rw-r--r-- | unittests/Tooling/Makefile | 2 | ||||
-rw-r--r-- | unittests/libclang/Makefile | 2 |
11 files changed, 17 insertions, 22 deletions
diff --git a/unittests/AST/Makefile b/unittests/AST/Makefile index 0282d21fcf..e3b3d7dc33 100644 --- a/unittests/AST/Makefile +++ b/unittests/AST/Makefile @@ -12,7 +12,7 @@ TESTNAME = AST include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ - clangRewriteCore.a clangRewriteFrontend.a \ + clangRewrite.a clangRewriteFrontend.a \ clangParse.a clangSema.a clangAnalysis.a \ clangEdit.a clangAST.a clangASTMatchers.a clangLex.a clangBasic.a diff --git a/unittests/ASTMatchers/Dynamic/Makefile b/unittests/ASTMatchers/Dynamic/Makefile index 66b183c0e4..dfd0086c88 100644 --- a/unittests/ASTMatchers/Dynamic/Makefile +++ b/unittests/ASTMatchers/Dynamic/Makefile @@ -13,7 +13,7 @@ TESTNAME = DynamicASTMatchers include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ - clangRewriteCore.a clangRewriteFrontend.a clangParse.a clangSema.a \ + clangRewrite.a clangRewriteFrontend.a clangParse.a clangSema.a \ clangAnalysis.a clangEdit.a clangAST.a clangASTMatchers.a \ clangLex.a clangBasic.a clangDynamicASTMatchers.a diff --git a/unittests/ASTMatchers/Makefile b/unittests/ASTMatchers/Makefile index dad300c04d..92f2fa0e5d 100644 --- a/unittests/ASTMatchers/Makefile +++ b/unittests/ASTMatchers/Makefile @@ -15,7 +15,7 @@ TESTNAME = ASTMatchers include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ - clangRewriteCore.a clangRewriteFrontend.a \ + clangRewrite.a clangRewriteFrontend.a \ clangParse.a clangSema.a clangAnalysis.a \ clangEdit.a clangAST.a clangASTMatchers.a clangLex.a clangBasic.a diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index cc1322699e..936b8b2065 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -15,13 +15,12 @@ add_subdirectory(Driver) if(CLANG_ENABLE_STATIC_ANALYZER) add_subdirectory(Frontend) endif() -if(CLANG_ENABLE_REWRITER) - add_subdirectory(ASTMatchers) - add_subdirectory(AST) - add_subdirectory(Tooling) - add_subdirectory(Format) - add_subdirectory(Sema) -endif() -if(NOT WIN32) # FIXME:Investigating. +add_subdirectory(ASTMatchers) +add_subdirectory(AST) +add_subdirectory(Tooling) +add_subdirectory(Format) +add_subdirectory(Sema) +# FIXME: Why are the libclang unit tests disabled on Windows? +if(NOT WIN32) add_subdirectory(libclang) endif() diff --git a/unittests/Format/Makefile b/unittests/Format/Makefile index 7de127caaf..e6dce4d8e8 100644 --- a/unittests/Format/Makefile +++ b/unittests/Format/Makefile @@ -12,7 +12,7 @@ TESTNAME = Format include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangFormat.a clangTooling.a clangFrontend.a clangSerialization.a \ - clangDriver.a clangParse.a clangRewriteCore.a \ + clangDriver.a clangParse.a clangRewrite.a \ clangRewriteFrontend.a clangSema.a clangAnalysis.a clangEdit.a \ clangAST.a clangASTMatchers.a clangLex.a clangBasic.a diff --git a/unittests/Frontend/Makefile b/unittests/Frontend/Makefile index 7de9fb4778..a63ae18245 100644 --- a/unittests/Frontend/Makefile +++ b/unittests/Frontend/Makefile @@ -14,7 +14,7 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangFrontendTool.a clangFrontend.a clangDriver.a \ clangSerialization.a clangCodeGen.a clangParse.a clangSema.a \ clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a \ - clangARCMigrate.a clangRewriteCore.a \ + clangARCMigrate.a clangRewrite.a \ clangRewriteFrontend.a clangEdit.a \ clangAnalysis.a clangAST.a clangLex.a clangBasic.a diff --git a/unittests/Makefile b/unittests/Makefile index 9b95a6eda2..95b1639415 100644 --- a/unittests/Makefile +++ b/unittests/Makefile @@ -14,14 +14,10 @@ ifndef CLANG_LEVEL IS_UNITTEST_LEVEL := 1 CLANG_LEVEL := .. -PARALLEL_DIRS = Basic Lex Driver libclang +PARALLEL_DIRS = Basic Lex Driver libclang Format ASTMatchers AST Tooling Sema include $(CLANG_LEVEL)/../..//Makefile.config -ifeq ($(ENABLE_CLANG_REWRITER),1) -PARALLEL_DIRS += Format ASTMatchers AST Tooling Sema -endif - ifeq ($(ENABLE_CLANG_ARCMT),1) PARALLEL_DIRS += Frontend endif diff --git a/unittests/Sema/Makefile b/unittests/Sema/Makefile index cd1d93df5b..7fd5c27ad6 100644 --- a/unittests/Sema/Makefile +++ b/unittests/Sema/Makefile @@ -12,7 +12,7 @@ TESTNAME = Sema include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ - clangRewriteCore.a clangRewriteFrontend.a \ + clangRewrite.a clangRewriteFrontend.a \ clangParse.a clangSema.a clangAnalysis.a \ clangEdit.a clangAST.a clangASTMatchers.a clangLex.a clangBasic.a diff --git a/unittests/Tooling/CMakeLists.txt b/unittests/Tooling/CMakeLists.txt index c59ff87b59..a41d87c6ea 100644 --- a/unittests/Tooling/CMakeLists.txt +++ b/unittests/Tooling/CMakeLists.txt @@ -19,6 +19,6 @@ target_link_libraries(ToolingTests clangBasic clangFrontend clangLex - clangRewriteCore + clangRewrite clangTooling ) diff --git a/unittests/Tooling/Makefile b/unittests/Tooling/Makefile index 9d36f1fa3b..46af8a11bb 100644 --- a/unittests/Tooling/Makefile +++ b/unittests/Tooling/Makefile @@ -12,7 +12,7 @@ TESTNAME = Tooling include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ - clangParse.a clangRewriteCore.a clangRewriteFrontend.a \ + clangParse.a clangRewrite.a clangRewriteFrontend.a \ clangSema.a clangAnalysis.a clangEdit.a \ clangAST.a clangASTMatchers.a clangLex.a clangBasic.a diff --git a/unittests/libclang/Makefile b/unittests/libclang/Makefile index 7b14c82e09..a6590eb97a 100644 --- a/unittests/libclang/Makefile +++ b/unittests/libclang/Makefile @@ -17,7 +17,7 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option # Note that 'USEDLIBS' must include all of the core clang libraries # when -static is given to linker on cygming. USEDLIBS = clang.a \ - clangIndex.a clangFormat.a clangRewriteCore.a \ + clangIndex.a clangFormat.a clangRewrite.a \ clangFrontend.a clangDriver.a \ clangTooling.a \ clangSerialization.a clangParse.a clangSema.a \ |