gribozavr updated this revision to Diff 267214.
gribozavr added a comment.
Added a modulemap entry for the new Clang library.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D80792/new/
https://reviews.llvm.org/D80792
Files:
clang/include/clang/Testing/CommandLineArgs.h
clang/include/clang/module.modulemap
clang/lib/CMakeLists.txt
clang/lib/Testing/CMakeLists.txt
clang/lib/Testing/CommandLineArgs.cpp
clang/unittests/AST/ASTImporterFixtures.h
clang/unittests/AST/CMakeLists.txt
clang/unittests/AST/Language.cpp
clang/unittests/AST/Language.h
clang/unittests/AST/MatchVerifier.h
clang/unittests/AST/StructuralEquivalenceTest.cpp
Index: clang/unittests/AST/StructuralEquivalenceTest.cpp
===================================================================
--- clang/unittests/AST/StructuralEquivalenceTest.cpp
+++ clang/unittests/AST/StructuralEquivalenceTest.cpp
@@ -2,10 +2,10 @@
#include "clang/AST/ASTStructuralEquivalence.h"
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Frontend/ASTUnit.h"
+#include "clang/Testing/CommandLineArgs.h"
#include "clang/Tooling/Tooling.h"
#include "llvm/Support/Host.h"
-#include "Language.h"
#include "DeclMatcher.h"
#include "gtest/gtest.h"
Index: clang/unittests/AST/MatchVerifier.h
===================================================================
--- clang/unittests/AST/MatchVerifier.h
+++ clang/unittests/AST/MatchVerifier.h
@@ -21,8 +21,8 @@
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
+#include "clang/Testing/CommandLineArgs.h"
#include "clang/Tooling/Tooling.h"
-#include "Language.h"
#include "gtest/gtest.h"
namespace clang {
Index: clang/unittests/AST/CMakeLists.txt
===================================================================
--- clang/unittests/AST/CMakeLists.txt
+++ clang/unittests/AST/CMakeLists.txt
@@ -26,7 +26,6 @@
DeclTest.cpp
EvaluateAsRValueTest.cpp
ExternalASTSourceTest.cpp
- Language.cpp
NamedDeclPrinterTest.cpp
RecursiveASTVisitorTest.cpp
SizelessTypesTest.cpp
@@ -42,6 +41,7 @@
clangBasic
clangFrontend
clangSerialization
+ clangTesting
clangTooling
)
Index: clang/unittests/AST/ASTImporterFixtures.h
===================================================================
--- clang/unittests/AST/ASTImporterFixtures.h
+++ clang/unittests/AST/ASTImporterFixtures.h
@@ -19,11 +19,11 @@
#include "clang/AST/ASTImporter.h"
#include "clang/AST/ASTImporterSharedState.h"
#include "clang/Frontend/ASTUnit.h"
+#include "clang/Testing/CommandLineArgs.h"
#include "llvm/Support/Error.h"
#include "llvm/Support/ErrorHandling.h"
#include "DeclMatcher.h"
-#include "Language.h"
#include <sstream>
Index: clang/lib/Testing/CommandLineArgs.cpp
===================================================================
--- clang/lib/Testing/CommandLineArgs.cpp
+++ clang/lib/Testing/CommandLineArgs.cpp
@@ -1,16 +1,12 @@
-//===------ unittest/AST/Language.cpp - AST unit test support -------------===//
+//===--- CommandLineArgs.cpp ----------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-//
-// This file defines language options for AST unittests.
-//
-//===----------------------------------------------------------------------===//
-#include "Language.h"
+#include "clang/Testing/CommandLineArgs.h"
#include "llvm/Support/ErrorHandling.h"
namespace clang {
Index: clang/lib/Testing/CMakeLists.txt
===================================================================
--- /dev/null
+++ clang/lib/Testing/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(LLVM_LINK_COMPONENTS
+ Support
+ )
+
+add_clang_library(clangTesting
+ CommandLineArgs.cpp
+ )
Index: clang/lib/CMakeLists.txt
===================================================================
--- clang/lib/CMakeLists.txt
+++ clang/lib/CMakeLists.txt
@@ -24,3 +24,4 @@
add_subdirectory(StaticAnalyzer)
endif()
add_subdirectory(Format)
+add_subdirectory(Testing)
Index: clang/include/clang/module.modulemap
===================================================================
--- clang/include/clang/module.modulemap
+++ clang/include/clang/module.modulemap
@@ -152,6 +152,12 @@
module * { export * }
}
+module Clang_Testing {
+ requires cplusplus
+ umbrella "Testing"
+ module * { export * }
+}
+
module Clang_Tooling {
requires cplusplus umbrella "Tooling" module * { export * }
// FIXME: Exclude these headers to avoid pulling all of the AST matchers
Index: clang/include/clang/Testing/CommandLineArgs.h
===================================================================
--- clang/include/clang/Testing/CommandLineArgs.h
+++ clang/include/clang/Testing/CommandLineArgs.h
@@ -1,4 +1,4 @@
-//===------ unittest/AST/Language.h - AST unit test support ---------------===//
+//===--- CommandLineArgs.h ------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -6,15 +6,15 @@
//
//===----------------------------------------------------------------------===//
//
-// This file defines language options for AST unittests.
+// This file defines language options for Clang unittests.
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_UNITTESTS_AST_LANGUAGE_H
-#define LLVM_CLANG_UNITTESTS_AST_LANGUAGE_H
+#ifndef LLVM_CLANG_TESTING_COMMAND_LINE_ARGS_H
+#define LLVM_CLANG_TESTING_COMMAND_LINE_ARGS_H
-#include <vector>
#include <string>
+#include <vector>
namespace clang {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
