llvmbot wrote:

<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-clang-static-analyzer-1

Author: Arseniy Zaostrovnykh (necto)

<details>
<summary>Changes</summary>

Move CTU related LIT tests to a dedicated directory.

-- 

CPP-7804

---

Patch is 38.90 KiB, truncated to 20.00 KiB below, full version: 
https://github.com/llvm/llvm-project/pull/188760.diff


50 Files Affected:

- (removed) 
clang/test/Analysis/Inputs/ctu-cxxdefaultinitexpr-import.cpp.externalDefMap.ast-dump.txt
 (-4) 
- (removed) clang/test/Analysis/Inputs/ctu-import.c.externalDefMap.ast-dump.txt 
(-1) 
- (removed) 
clang/test/Analysis/Inputs/ctu-onego-existingdef-other.cpp.externalDefMap.ast-dump.txt
 (-2) 
- (removed) 
clang/test/Analysis/Inputs/ctu-onego-indirect-other.cpp.externalDefMap.ast-dump.txt
 (-2) 
- (removed) 
clang/test/Analysis/Inputs/ctu-onego-small-other.cpp.externalDefMap.ast-dump.txt
 (-1) 
- (removed) 
clang/test/Analysis/Inputs/ctu-onego-toplevel-other.cpp.externalDefMap.ast-dump.txt
 (-1) 
- (removed) clang/test/Analysis/Inputs/ctu-other.c.externalDefMap.ast-dump.txt 
(-7) 
- (removed) 
clang/test/Analysis/Inputs/ctu-other.cpp.externalDefMap.ast-dump.txt (-31) 
- (removed) 
clang/test/Analysis/Inputs/ctu-test-import-failure-import.cpp.externalDefMap.ast-dump.txt
 (-5) 
- (renamed) clang/test/Analysis/ctu/Inputs/chain.cpp () 
- (renamed) clang/test/Analysis/ctu/Inputs/cxxdefaultinitexpr-import.cpp () 
- (added) 
clang/test/Analysis/ctu/Inputs/cxxdefaultinitexpr-import.cpp.externalDefMap.ast-dump.txt
 (+4) 
- (renamed) clang/test/Analysis/ctu/Inputs/import.c () 
- (added) clang/test/Analysis/ctu/Inputs/import.c.externalDefMap.ast-dump.txt 
(+1) 
- (renamed) clang/test/Analysis/ctu/Inputs/inherited-default-ctor-other.cpp () 
- (added) 
clang/test/Analysis/ctu/Inputs/invalid-ast-other.cpp.externalDefMap.ast-dump.txt
 (+1) 
- (renamed) clang/test/Analysis/ctu/Inputs/lookup-name-with-space.cpp () 
- (added) 
clang/test/Analysis/ctu/Inputs/missing-ast.cpp.externalDefMap.ast-dump.txt (+1) 
- (renamed) clang/test/Analysis/ctu/Inputs/onego-existingdef-other.cpp () 
- (added) 
clang/test/Analysis/ctu/Inputs/onego-existingdef-other.cpp.externalDefMap.ast-dump.txt
 (+2) 
- (renamed) clang/test/Analysis/ctu/Inputs/onego-indirect-other.cpp () 
- (added) 
clang/test/Analysis/ctu/Inputs/onego-indirect-other.cpp.externalDefMap.ast-dump.txt
 (+2) 
- (renamed) clang/test/Analysis/ctu/Inputs/onego-small-other.cpp () 
- (added) 
clang/test/Analysis/ctu/Inputs/onego-small-other.cpp.externalDefMap.ast-dump.txt
 (+1) 
- (renamed) clang/test/Analysis/ctu/Inputs/onego-toplevel-other.cpp () 
- (added) 
clang/test/Analysis/ctu/Inputs/onego-toplevel-other.cpp.externalDefMap.ast-dump.txt
 (+1) 
- (renamed) clang/test/Analysis/ctu/Inputs/other.c () 
- (added) clang/test/Analysis/ctu/Inputs/other.c.externalDefMap.ast-dump.txt 
(+7) 
- (renamed) clang/test/Analysis/ctu/Inputs/other.cpp (+1-1) 
- (added) clang/test/Analysis/ctu/Inputs/other.cpp.externalDefMap.ast-dump.txt 
(+31) 
- (renamed) clang/test/Analysis/ctu/Inputs/test-import-failure-import.cpp () 
- (added) 
clang/test/Analysis/ctu/Inputs/test-import-failure-import.cpp.externalDefMap.ast-dump.txt
 (+5) 
- (renamed) clang/test/Analysis/ctu/cxxdefaultinitexpr.cpp (+2-2) 
- (renamed) clang/test/Analysis/ctu/different-triples.cpp (+3-3) 
- (renamed) clang/test/Analysis/ctu/hdr.h () 
- (renamed) clang/test/Analysis/ctu/implicit.c (+2-2) 
- (renamed) clang/test/Analysis/ctu/import-threshold.c () 
- (renamed) clang/test/Analysis/ctu/import-type-decl-definition.c () 
- (renamed) clang/test/Analysis/ctu/inherited-default-ctor.cpp (+4-4) 
- (renamed) clang/test/Analysis/ctu/lookup-name-with-space.cpp (+2-2) 
- (renamed) clang/test/Analysis/ctu/main.c (+4-4) 
- (renamed) clang/test/Analysis/ctu/main.cpp (+8-8) 
- (renamed) clang/test/Analysis/ctu/on-demand-parsing.c (+7-7) 
- (renamed) clang/test/Analysis/ctu/on-demand-parsing.cpp (+13-13) 
- (renamed) clang/test/Analysis/ctu/onego-existingdef.cpp (+2-2) 
- (renamed) clang/test/Analysis/ctu/onego-indirect.cpp (+2-2) 
- (renamed) clang/test/Analysis/ctu/onego-small.cpp (+2-2) 
- (renamed) clang/test/Analysis/ctu/onego-toplevel.cpp (+2-2) 
- (renamed) clang/test/Analysis/ctu/test-import-failure.cpp (+6-6) 
- (renamed) clang/test/Analysis/ctu/unknown-parts-in-triples.cpp (+2-2) 


``````````diff
diff --git 
a/clang/test/Analysis/Inputs/ctu-cxxdefaultinitexpr-import.cpp.externalDefMap.ast-dump.txt
 
b/clang/test/Analysis/Inputs/ctu-cxxdefaultinitexpr-import.cpp.externalDefMap.ast-dump.txt
deleted file mode 100644
index 7c8403c2fe684..0000000000000
--- 
a/clang/test/Analysis/Inputs/ctu-cxxdefaultinitexpr-import.cpp.externalDefMap.ast-dump.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-14:c:@S@foo@value ctu-cxxdefaultinitexpr-import.cpp.ast
-35:c:@S@QDomElementPrivate@F@importee# ctu-cxxdefaultinitexpr-import.cpp.ast
-45:c:@S@QDomElementPrivate@F@QDomElementPrivate# 
ctu-cxxdefaultinitexpr-import.cpp.ast
-39:c:@S@QDomNodePrivate@F@QDomNodePrivate# 
ctu-cxxdefaultinitexpr-import.cpp.ast
diff --git 
a/clang/test/Analysis/Inputs/ctu-import.c.externalDefMap.ast-dump.txt 
b/clang/test/Analysis/Inputs/ctu-import.c.externalDefMap.ast-dump.txt
deleted file mode 100644
index ee5317d36f714..0000000000000
--- a/clang/test/Analysis/Inputs/ctu-import.c.externalDefMap.ast-dump.txt
+++ /dev/null
@@ -1 +0,0 @@
-23:c:@F@testStaticImplicit ctu-import.c.ast
diff --git 
a/clang/test/Analysis/Inputs/ctu-onego-existingdef-other.cpp.externalDefMap.ast-dump.txt
 
b/clang/test/Analysis/Inputs/ctu-onego-existingdef-other.cpp.externalDefMap.ast-dump.txt
deleted file mode 100644
index e785e61ddb624..0000000000000
--- 
a/clang/test/Analysis/Inputs/ctu-onego-existingdef-other.cpp.externalDefMap.ast-dump.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-9:c:@F@bar# ctu-onego-existingdef-other.cpp.ast
-11:c:@F@other# ctu-onego-existingdef-other.cpp.ast
diff --git 
a/clang/test/Analysis/Inputs/ctu-onego-indirect-other.cpp.externalDefMap.ast-dump.txt
 
b/clang/test/Analysis/Inputs/ctu-onego-indirect-other.cpp.externalDefMap.ast-dump.txt
deleted file mode 100644
index 4d5fbd25641d8..0000000000000
--- 
a/clang/test/Analysis/Inputs/ctu-onego-indirect-other.cpp.externalDefMap.ast-dump.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-11:c:@F@other# ctu-onego-indirect-other.cpp.ast
-9:c:@F@bar# ctu-onego-indirect-other.cpp.ast
diff --git 
a/clang/test/Analysis/Inputs/ctu-onego-small-other.cpp.externalDefMap.ast-dump.txt
 
b/clang/test/Analysis/Inputs/ctu-onego-small-other.cpp.externalDefMap.ast-dump.txt
deleted file mode 100644
index fa849740959c2..0000000000000
--- 
a/clang/test/Analysis/Inputs/ctu-onego-small-other.cpp.externalDefMap.ast-dump.txt
+++ /dev/null
@@ -1 +0,0 @@
-9:c:@F@bar# ctu-onego-small-other.cpp.ast
diff --git 
a/clang/test/Analysis/Inputs/ctu-onego-toplevel-other.cpp.externalDefMap.ast-dump.txt
 
b/clang/test/Analysis/Inputs/ctu-onego-toplevel-other.cpp.externalDefMap.ast-dump.txt
deleted file mode 100644
index 2db5f546ed24d..0000000000000
--- 
a/clang/test/Analysis/Inputs/ctu-onego-toplevel-other.cpp.externalDefMap.ast-dump.txt
+++ /dev/null
@@ -1 +0,0 @@
-13:c:@F@other#I# ctu-onego-toplevel-other.cpp.ast
diff --git a/clang/test/Analysis/Inputs/ctu-other.c.externalDefMap.ast-dump.txt 
b/clang/test/Analysis/Inputs/ctu-other.c.externalDefMap.ast-dump.txt
deleted file mode 100644
index ab675c3242c7e..0000000000000
--- a/clang/test/Analysis/Inputs/ctu-other.c.externalDefMap.ast-dump.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-14:c:@F@inlineAsm ctu-other.c.ast
-6:c:@F@g ctu-other.c.ast
-6:c:@F@f ctu-other.c.ast
-14:c:@F@enumCheck ctu-other.c.ast
-18:c:@F@identImplicit ctu-other.c.ast
-18:c:@F@structInProto ctu-other.c.ast
-23:c:@F@switchWithoutCases ctu-other.c.ast
diff --git 
a/clang/test/Analysis/Inputs/ctu-other.cpp.externalDefMap.ast-dump.txt 
b/clang/test/Analysis/Inputs/ctu-other.cpp.externalDefMap.ast-dump.txt
deleted file mode 100644
index 439232333b609..0000000000000
--- a/clang/test/Analysis/Inputs/ctu-other.cpp.externalDefMap.ast-dump.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-19:c:@N@chns@F@chf1#I# ctu-other.cpp.ast
-30:c:@N@myns@N@embed_ns@F@fens#I# ctu-other.cpp.ast
-9:c:@F@g#I# ctu-other.cpp.ast
-21:c:@S@mycls@F@fscl#I#S ctu-other.cpp.ast
-19:c:@S@mycls@F@fcl#I# ctu-other.cpp.ast
-20:c:@S@mycls@F@fvcl#I# ctu-other.cpp.ast
-31:c:@N@myns@S@embed_cls@F@fecl#I# ctu-other.cpp.ast
-34:c:@S@mycls@S@embed_cls2@F@fecl2#I# ctu-other.cpp.ast
-22:c:@S@derived@F@fvcl#I# ctu-other.cpp.ast
-9:c:@F@f#I# ctu-other.cpp.ast
-18:c:@N@myns@F@fns#I# ctu-other.cpp.ast
-9:c:@F@h#I# ctu-other.cpp.ast
-15:c:@F@h_chain#I# ctu-chain.cpp.ast
-27:c:@N@chns@S@chcls@F@chf4#I# ctu-chain.cpp.ast
-19:c:@N@chns@F@chf2#I# ctu-chain.cpp.ast
-29:c:@F@fun_using_anon_struct#I# ctu-other.cpp.ast
-24:c:@F@other_macro_diag#I# ctu-other.cpp.ast
-9:c:@extInt ctu-other.cpp.ast
-17:c:@N@intns@extInt ctu-other.cpp.ast
-7:c:@extS ctu-other.cpp.ast
-9:c:@extNTS ctu-other.cpp.ast
-8:c:@S@A@a ctu-other.cpp.ast
-8:c:@extSC ctu-other.cpp.ast
-10:c:@S@ST@sc ctu-other.cpp.ast
-9:c:@extSCN ctu-other.cpp.ast
-12:c:@extSubSCN ctu-other.cpp.ast
-9:c:@extSCC ctu-other.cpp.ast
-7:c:@extU ctu-other.cpp.ast
-26:c:@S@TestAnonUnionUSR@Test ctu-other.cpp.ast
-53:c:@F@testImportOfIncompleteDefaultParmDuringImport#I# ctu-other.cpp.ast
-39:c:@F@testImportOfDelegateConstructor#I# ctu-other.cpp.ast
diff --git 
a/clang/test/Analysis/Inputs/ctu-test-import-failure-import.cpp.externalDefMap.ast-dump.txt
 
b/clang/test/Analysis/Inputs/ctu-test-import-failure-import.cpp.externalDefMap.ast-dump.txt
deleted file mode 100644
index 6ffb3795d3e36..0000000000000
--- 
a/clang/test/Analysis/Inputs/ctu-test-import-failure-import.cpp.externalDefMap.ast-dump.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-47:c:@N@std@S@allocator_traits@F@allocator_traits# 
ctu-test-import-failure-import.cpp.ast
-29:c:@N@CommandLine@RootCommands ctu-test-import-failure-import.cpp.ast
-55:c:@N@std@N@__cxx11@ST>3#T#T#T@basic_string@F@_M_assign# 
ctu-test-import-failure-import.cpp.ast
-97:c:@S@CommandLineOptionDefinition@F@CommandLineOptionDefinition#&1$@S@CommandLineOptionDefinition#
 ctu-test-import-failure-import.cpp.ast
-29:c:@N@CommandLine@RootExamples ctu-test-import-failure-import.cpp.ast
\ No newline at end of file
diff --git a/clang/test/Analysis/Inputs/ctu-chain.cpp 
b/clang/test/Analysis/ctu/Inputs/chain.cpp
similarity index 100%
rename from clang/test/Analysis/Inputs/ctu-chain.cpp
rename to clang/test/Analysis/ctu/Inputs/chain.cpp
diff --git a/clang/test/Analysis/Inputs/ctu-cxxdefaultinitexpr-import.cpp 
b/clang/test/Analysis/ctu/Inputs/cxxdefaultinitexpr-import.cpp
similarity index 100%
rename from clang/test/Analysis/Inputs/ctu-cxxdefaultinitexpr-import.cpp
rename to clang/test/Analysis/ctu/Inputs/cxxdefaultinitexpr-import.cpp
diff --git 
a/clang/test/Analysis/ctu/Inputs/cxxdefaultinitexpr-import.cpp.externalDefMap.ast-dump.txt
 
b/clang/test/Analysis/ctu/Inputs/cxxdefaultinitexpr-import.cpp.externalDefMap.ast-dump.txt
new file mode 100644
index 0000000000000..c8246745d57ff
--- /dev/null
+++ 
b/clang/test/Analysis/ctu/Inputs/cxxdefaultinitexpr-import.cpp.externalDefMap.ast-dump.txt
@@ -0,0 +1,4 @@
+14:c:@S@foo@value cxxdefaultinitexpr-import.cpp.ast
+35:c:@S@QDomElementPrivate@F@importee# cxxdefaultinitexpr-import.cpp.ast
+45:c:@S@QDomElementPrivate@F@QDomElementPrivate# 
cxxdefaultinitexpr-import.cpp.ast
+39:c:@S@QDomNodePrivate@F@QDomNodePrivate# cxxdefaultinitexpr-import.cpp.ast
diff --git a/clang/test/Analysis/Inputs/ctu-import.c 
b/clang/test/Analysis/ctu/Inputs/import.c
similarity index 100%
rename from clang/test/Analysis/Inputs/ctu-import.c
rename to clang/test/Analysis/ctu/Inputs/import.c
diff --git 
a/clang/test/Analysis/ctu/Inputs/import.c.externalDefMap.ast-dump.txt 
b/clang/test/Analysis/ctu/Inputs/import.c.externalDefMap.ast-dump.txt
new file mode 100644
index 0000000000000..c2629f52a0fcd
--- /dev/null
+++ b/clang/test/Analysis/ctu/Inputs/import.c.externalDefMap.ast-dump.txt
@@ -0,0 +1 @@
+23:c:@F@testStaticImplicit import.c.ast
diff --git a/clang/test/Analysis/Inputs/ctu-inherited-default-ctor-other.cpp 
b/clang/test/Analysis/ctu/Inputs/inherited-default-ctor-other.cpp
similarity index 100%
rename from clang/test/Analysis/Inputs/ctu-inherited-default-ctor-other.cpp
rename to clang/test/Analysis/ctu/Inputs/inherited-default-ctor-other.cpp
diff --git 
a/clang/test/Analysis/ctu/Inputs/invalid-ast-other.cpp.externalDefMap.ast-dump.txt
 
b/clang/test/Analysis/ctu/Inputs/invalid-ast-other.cpp.externalDefMap.ast-dump.txt
new file mode 100644
index 0000000000000..9e431a3ae3195
--- /dev/null
+++ 
b/clang/test/Analysis/ctu/Inputs/invalid-ast-other.cpp.externalDefMap.ast-dump.txt
@@ -0,0 +1 @@
+14:c:@F@external# invalid-ast-other.cpp.ast
\ No newline at end of file
diff --git a/clang/test/Analysis/Inputs/ctu-lookup-name-with-space.cpp 
b/clang/test/Analysis/ctu/Inputs/lookup-name-with-space.cpp
similarity index 100%
rename from clang/test/Analysis/Inputs/ctu-lookup-name-with-space.cpp
rename to clang/test/Analysis/ctu/Inputs/lookup-name-with-space.cpp
diff --git 
a/clang/test/Analysis/ctu/Inputs/missing-ast.cpp.externalDefMap.ast-dump.txt 
b/clang/test/Analysis/ctu/Inputs/missing-ast.cpp.externalDefMap.ast-dump.txt
new file mode 100644
index 0000000000000..778429c35b748
--- /dev/null
+++ b/clang/test/Analysis/ctu/Inputs/missing-ast.cpp.externalDefMap.ast-dump.txt
@@ -0,0 +1 @@
+14:c:@F@external# wrong-missing-ast.cpp.ast
\ No newline at end of file
diff --git a/clang/test/Analysis/Inputs/ctu-onego-existingdef-other.cpp 
b/clang/test/Analysis/ctu/Inputs/onego-existingdef-other.cpp
similarity index 100%
rename from clang/test/Analysis/Inputs/ctu-onego-existingdef-other.cpp
rename to clang/test/Analysis/ctu/Inputs/onego-existingdef-other.cpp
diff --git 
a/clang/test/Analysis/ctu/Inputs/onego-existingdef-other.cpp.externalDefMap.ast-dump.txt
 
b/clang/test/Analysis/ctu/Inputs/onego-existingdef-other.cpp.externalDefMap.ast-dump.txt
new file mode 100644
index 0000000000000..30c1d3bdcce13
--- /dev/null
+++ 
b/clang/test/Analysis/ctu/Inputs/onego-existingdef-other.cpp.externalDefMap.ast-dump.txt
@@ -0,0 +1,2 @@
+9:c:@F@bar# onego-existingdef-other.cpp.ast
+11:c:@F@other# onego-existingdef-other.cpp.ast
diff --git a/clang/test/Analysis/Inputs/ctu-onego-indirect-other.cpp 
b/clang/test/Analysis/ctu/Inputs/onego-indirect-other.cpp
similarity index 100%
rename from clang/test/Analysis/Inputs/ctu-onego-indirect-other.cpp
rename to clang/test/Analysis/ctu/Inputs/onego-indirect-other.cpp
diff --git 
a/clang/test/Analysis/ctu/Inputs/onego-indirect-other.cpp.externalDefMap.ast-dump.txt
 
b/clang/test/Analysis/ctu/Inputs/onego-indirect-other.cpp.externalDefMap.ast-dump.txt
new file mode 100644
index 0000000000000..8214cebf6134e
--- /dev/null
+++ 
b/clang/test/Analysis/ctu/Inputs/onego-indirect-other.cpp.externalDefMap.ast-dump.txt
@@ -0,0 +1,2 @@
+11:c:@F@other# onego-indirect-other.cpp.ast
+9:c:@F@bar# onego-indirect-other.cpp.ast
diff --git a/clang/test/Analysis/Inputs/ctu-onego-small-other.cpp 
b/clang/test/Analysis/ctu/Inputs/onego-small-other.cpp
similarity index 100%
rename from clang/test/Analysis/Inputs/ctu-onego-small-other.cpp
rename to clang/test/Analysis/ctu/Inputs/onego-small-other.cpp
diff --git 
a/clang/test/Analysis/ctu/Inputs/onego-small-other.cpp.externalDefMap.ast-dump.txt
 
b/clang/test/Analysis/ctu/Inputs/onego-small-other.cpp.externalDefMap.ast-dump.txt
new file mode 100644
index 0000000000000..121cc9129ecca
--- /dev/null
+++ 
b/clang/test/Analysis/ctu/Inputs/onego-small-other.cpp.externalDefMap.ast-dump.txt
@@ -0,0 +1 @@
+9:c:@F@bar# onego-small-other.cpp.ast
diff --git a/clang/test/Analysis/Inputs/ctu-onego-toplevel-other.cpp 
b/clang/test/Analysis/ctu/Inputs/onego-toplevel-other.cpp
similarity index 100%
rename from clang/test/Analysis/Inputs/ctu-onego-toplevel-other.cpp
rename to clang/test/Analysis/ctu/Inputs/onego-toplevel-other.cpp
diff --git 
a/clang/test/Analysis/ctu/Inputs/onego-toplevel-other.cpp.externalDefMap.ast-dump.txt
 
b/clang/test/Analysis/ctu/Inputs/onego-toplevel-other.cpp.externalDefMap.ast-dump.txt
new file mode 100644
index 0000000000000..fe19207c29c47
--- /dev/null
+++ 
b/clang/test/Analysis/ctu/Inputs/onego-toplevel-other.cpp.externalDefMap.ast-dump.txt
@@ -0,0 +1 @@
+13:c:@F@other#I# onego-toplevel-other.cpp.ast
diff --git a/clang/test/Analysis/Inputs/ctu-other.c 
b/clang/test/Analysis/ctu/Inputs/other.c
similarity index 100%
rename from clang/test/Analysis/Inputs/ctu-other.c
rename to clang/test/Analysis/ctu/Inputs/other.c
diff --git a/clang/test/Analysis/ctu/Inputs/other.c.externalDefMap.ast-dump.txt 
b/clang/test/Analysis/ctu/Inputs/other.c.externalDefMap.ast-dump.txt
new file mode 100644
index 0000000000000..92ddd4a6ec35e
--- /dev/null
+++ b/clang/test/Analysis/ctu/Inputs/other.c.externalDefMap.ast-dump.txt
@@ -0,0 +1,7 @@
+14:c:@F@inlineAsm other.c.ast
+6:c:@F@g other.c.ast
+6:c:@F@f other.c.ast
+14:c:@F@enumCheck other.c.ast
+18:c:@F@identImplicit other.c.ast
+18:c:@F@structInProto other.c.ast
+23:c:@F@switchWithoutCases other.c.ast
diff --git a/clang/test/Analysis/Inputs/ctu-other.cpp 
b/clang/test/Analysis/ctu/Inputs/other.cpp
similarity index 99%
rename from clang/test/Analysis/Inputs/ctu-other.cpp
rename to clang/test/Analysis/ctu/Inputs/other.cpp
index a7bf1cef65b92..0a0b0a53d41ff 100644
--- a/clang/test/Analysis/Inputs/ctu-other.cpp
+++ b/clang/test/Analysis/ctu/Inputs/other.cpp
@@ -1,4 +1,4 @@
-#include "../ctu-hdr.h"
+#include "../hdr.h"
 
 int callback_to_main(int x);
 int f(int x) {
diff --git 
a/clang/test/Analysis/ctu/Inputs/other.cpp.externalDefMap.ast-dump.txt 
b/clang/test/Analysis/ctu/Inputs/other.cpp.externalDefMap.ast-dump.txt
new file mode 100644
index 0000000000000..c7463e46b9b5a
--- /dev/null
+++ b/clang/test/Analysis/ctu/Inputs/other.cpp.externalDefMap.ast-dump.txt
@@ -0,0 +1,31 @@
+19:c:@N@chns@F@chf1#I# other.cpp.ast
+30:c:@N@myns@N@embed_ns@F@fens#I# other.cpp.ast
+9:c:@F@g#I# other.cpp.ast
+21:c:@S@mycls@F@fscl#I#S other.cpp.ast
+19:c:@S@mycls@F@fcl#I# other.cpp.ast
+20:c:@S@mycls@F@fvcl#I# other.cpp.ast
+31:c:@N@myns@S@embed_cls@F@fecl#I# other.cpp.ast
+34:c:@S@mycls@S@embed_cls2@F@fecl2#I# other.cpp.ast
+22:c:@S@derived@F@fvcl#I# other.cpp.ast
+9:c:@F@f#I# other.cpp.ast
+18:c:@N@myns@F@fns#I# other.cpp.ast
+9:c:@F@h#I# other.cpp.ast
+15:c:@F@h_chain#I# chain.cpp.ast
+27:c:@N@chns@S@chcls@F@chf4#I# chain.cpp.ast
+19:c:@N@chns@F@chf2#I# chain.cpp.ast
+29:c:@F@fun_using_anon_struct#I# other.cpp.ast
+24:c:@F@other_macro_diag#I# other.cpp.ast
+9:c:@extInt other.cpp.ast
+17:c:@N@intns@extInt other.cpp.ast
+7:c:@extS other.cpp.ast
+9:c:@extNTS other.cpp.ast
+8:c:@S@A@a other.cpp.ast
+8:c:@extSC other.cpp.ast
+10:c:@S@ST@sc other.cpp.ast
+9:c:@extSCN other.cpp.ast
+12:c:@extSubSCN other.cpp.ast
+9:c:@extSCC other.cpp.ast
+7:c:@extU other.cpp.ast
+26:c:@S@TestAnonUnionUSR@Test other.cpp.ast
+53:c:@F@testImportOfIncompleteDefaultParmDuringImport#I# other.cpp.ast
+39:c:@F@testImportOfDelegateConstructor#I# other.cpp.ast
diff --git a/clang/test/Analysis/Inputs/ctu-test-import-failure-import.cpp 
b/clang/test/Analysis/ctu/Inputs/test-import-failure-import.cpp
similarity index 100%
rename from clang/test/Analysis/Inputs/ctu-test-import-failure-import.cpp
rename to clang/test/Analysis/ctu/Inputs/test-import-failure-import.cpp
diff --git 
a/clang/test/Analysis/ctu/Inputs/test-import-failure-import.cpp.externalDefMap.ast-dump.txt
 
b/clang/test/Analysis/ctu/Inputs/test-import-failure-import.cpp.externalDefMap.ast-dump.txt
new file mode 100644
index 0000000000000..c5a4ab30101f5
--- /dev/null
+++ 
b/clang/test/Analysis/ctu/Inputs/test-import-failure-import.cpp.externalDefMap.ast-dump.txt
@@ -0,0 +1,5 @@
+47:c:@N@std@S@allocator_traits@F@allocator_traits# 
test-import-failure-import.cpp.ast
+29:c:@N@CommandLine@RootCommands test-import-failure-import.cpp.ast
+55:c:@N@std@N@__cxx11@ST>3#T#T#T@basic_string@F@_M_assign# 
test-import-failure-import.cpp.ast
+97:c:@S@CommandLineOptionDefinition@F@CommandLineOptionDefinition#&1$@S@CommandLineOptionDefinition#
 test-import-failure-import.cpp.ast
+29:c:@N@CommandLine@RootExamples test-import-failure-import.cpp.ast
\ No newline at end of file
diff --git a/clang/test/Analysis/ctu-cxxdefaultinitexpr.cpp 
b/clang/test/Analysis/ctu/cxxdefaultinitexpr.cpp
similarity index 80%
rename from clang/test/Analysis/ctu-cxxdefaultinitexpr.cpp
rename to clang/test/Analysis/ctu/cxxdefaultinitexpr.cpp
index 995db5614527c..bb02f273733b0 100644
--- a/clang/test/Analysis/ctu-cxxdefaultinitexpr.cpp
+++ b/clang/test/Analysis/ctu/cxxdefaultinitexpr.cpp
@@ -1,8 +1,8 @@
 // RUN: rm -rf %t && mkdir %t
 // RUN: mkdir -p %t/ctudir
 // RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -std=c++17 \
-// RUN:   -emit-pch -o %t/ctudir/ctu-cxxdefaultinitexpr-import.cpp.ast 
%S/Inputs/ctu-cxxdefaultinitexpr-import.cpp
-// RUN: cp 
%S/Inputs/ctu-cxxdefaultinitexpr-import.cpp.externalDefMap.ast-dump.txt 
%t/ctudir/externalDefMap.txt
+// RUN:   -emit-pch -o %t/ctudir/cxxdefaultinitexpr-import.cpp.ast 
%S/Inputs/cxxdefaultinitexpr-import.cpp
+// RUN: cp %S/Inputs/cxxdefaultinitexpr-import.cpp.externalDefMap.ast-dump.txt 
%t/ctudir/externalDefMap.txt
 // RUN: %clang_analyze_cc1 -triple x86_64-pc-linux-gnu -std=c++17 \
 // RUN:   -analyzer-checker=core \
 // RUN:   -analyzer-config experimental-enable-naive-ctu-analysis=true \
diff --git a/clang/test/Analysis/ctu-different-triples.cpp 
b/clang/test/Analysis/ctu/different-triples.cpp
similarity index 59%
rename from clang/test/Analysis/ctu-different-triples.cpp
rename to clang/test/Analysis/ctu/different-triples.cpp
index 68c7b0dd7dc30..95b7f8d4c3fed 100644
--- a/clang/test/Analysis/ctu-different-triples.cpp
+++ b/clang/test/Analysis/ctu/different-triples.cpp
@@ -1,8 +1,8 @@
 // RUN: rm -rf %t && mkdir %t
 // RUN: mkdir -p %t/ctudir
 // RUN: %clang_cc1 -std=c++14 -triple x86_64-pc-linux-gnu \
-// RUN:   -emit-pch -o %t/ctudir/ctu-other.cpp.ast %S/Inputs/ctu-other.cpp
-// RUN: cp %S/Inputs/ctu-other.cpp.externalDefMap.ast-dump.txt 
%t/ctudir/externalDefMap.txt
+// RUN:   -emit-pch -o %t/ctudir/other.cpp.ast %S/Inputs/other.cpp
+// RUN: cp %S/Inputs/other.cpp.externalDefMap.ast-dump.txt 
%t/ctudir/externalDefMap.txt
 // RUN: %clang_analyze_cc1 -std=c++14 -triple powerpc64-montavista-linux-gnu \
 // RUN:   -analyzer-checker=core,debug.ExprInspection \
 // RUN:   -analyzer-config experimental-enable-naive-ctu-analysis=true \
@@ -11,7 +11,7 @@
 // RUN:   -verify %s
 
 // We expect an error in this file, but without a location.
-// expected-error-re@./ctu-different-triples.cpp:*{{imported AST from {{.*}} 
had been generated for a different target, current: 
powerpc64-montavista-linux-gnu, imported: x86_64-pc-linux-gnu}}
+// expected-error-re@./different-triples.cpp:*{{imported AST from {{.*}} had 
been generated for a different target, current: powerpc64-montavista-linux-gnu, 
imported: x86_64-pc-linux-gnu}}
 
 int f(int);
 
diff --git a/clang/test/Analysis/ctu-hdr.h b/clang/test/Analysis/ctu/hdr.h
similarity index 100%
rename from clang/test/Analysis/ctu-hdr.h
rename to clang/test/Analysis/ctu/hdr.h
diff --git a/clang/test/Analysis/ctu-implicit.c 
b/clang/test/Analysis/ctu/implicit.c
similarity index 80%
rename from clang/test/Analysis/ctu-implicit.c
rename to clang/test/Analysis/ctu/implicit.c
index 63df5fb0542b1..b55b64f0d899b 100644
--- a/clang/test/Analysis/ctu-implicit.c
+++ b/clang/test/Analysis/ctu/implicit.c
@@ -1,8 +1,8 @@
 // RUN: rm -rf %t && mkdir %t
 // RUN: mkdir -p %t/ctudir2
 // RUN: %clang_cc1  \
-// RUN:   -emit-pch -o %t/ctudir2/ctu-import.c.ast %S/Inputs/ctu-import.c
-// RUN: cp %S/Inputs/ctu-import.c.externalDefMap.ast-dump.txt 
%t/ctudir2/externalDefMap.txt
+// RUN:   -emit-pch -o %t/ctudir2/import.c.ast %S/Inputs/import.c
+// RUN: cp %S/Inputs/import.c.externalDefMap.ast-dump.txt 
%t/ctudir2/externalDefMap.txt
 // RUN: %clang_analyze_cc1 \
 // RUN:   -analyzer-checker=core,debug.ExprInspection \
 // RUN:   -analyzer-config eagerly-assume=false \
diff --git a/clang/test/Analysis/ctu-import-threshold.c 
b/clang/test/Analysis/ctu/import-threshold.c
similarity index 100%
rename from clang/test/Analysis/ctu-import-threshold.c
rename to clang/test/Analysis/ctu/import-threshold.c
diff --git a/clang/test/Analysis/ctu-import-type-decl-definition.c 
b/clang/test/Analysis/ctu/import-type-decl-definition.c
similarity index 100%
rename from clang/test/Analysis/ctu-import-type-decl-definition.c
rename to clang/test/Analysis/ctu/import-type-decl-definition.c
diff --git a/clang/test/Analysis/ctu-inherited-default-ctor.cpp 
b/clang/test/Analysis/ctu/inherited-default-ctor.cpp
similarity index 76%
rename from clang/test/Analysis/ctu-inherited-default-ctor.cpp
rename to clang/test/Analysis/ctu/inherited-default-ctor.cpp
index e89fb2de707b0..527b9410d833e 100644
--- a/clang/test/Analysis/ctu-inherited-default-ctor.cpp
+++ b/clang/test/Analysis/ctu/inherited-default-ctor.cpp
@@ -2,9 +2,9 @@
 //
 // RUN: rm -rf %t && mkdir -p %t/ctudir
 // RUN: %clang_cc1 -std=c++...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/188760
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to