diff options
17 files changed, 31 insertions, 31 deletions
diff --git a/clang-tools-extra/test/lit.cfg b/clang-tools-extra/test/lit.cfg index 0d50e1b8e7e..69c39063b8b 100644 --- a/clang-tools-extra/test/lit.cfg +++ b/clang-tools-extra/test/lit.cfg @@ -32,7 +32,7 @@ execute_external = (platform.system() != 'Windows' config.test_format = lit.formats.ShTest(execute_external) # suffixes: A list of file extensions to treat as test files. -config.suffixes = ['.c', '.cpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s'] +config.suffixes = ['.c', '.cpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s', '.modularize'] # test_source_root: The root path where tests are located. config.test_source_root = os.path.dirname(__file__) diff --git a/clang-tools-extra/test/modularize/InputProblemsDuplicate/Header1.h b/clang-tools-extra/test/modularize/InputProblemsDuplicate/Header1.h deleted file mode 100644 index ad41bb13ab6..00000000000 --- a/clang-tools-extra/test/modularize/InputProblemsDuplicate/Header1.h +++ /dev/null @@ -1,2 +0,0 @@ -// Same decl as in Header2.h. -typedef int TypeInt; diff --git a/clang-tools-extra/test/modularize/InputProblemsDuplicate/Header2.h b/clang-tools-extra/test/modularize/InputProblemsDuplicate/Header2.h deleted file mode 100644 index 938bb22f48f..00000000000 --- a/clang-tools-extra/test/modularize/InputProblemsDuplicate/Header2.h +++ /dev/null @@ -1,2 +0,0 @@ -// Same decl as in Header1.h. -typedef int TypeInt; diff --git a/clang-tools-extra/test/modularize/InputProblemsInconsistent/Header1.h b/clang-tools-extra/test/modularize/InputProblemsInconsistent/Header1.h deleted file mode 100644 index 67629829557..00000000000 --- a/clang-tools-extra/test/modularize/InputProblemsInconsistent/Header1.h +++ /dev/null @@ -1,4 +0,0 @@ -// Define symbol such that a declaration exists when this header -// is included, but not when Header2.h is included. -#define SYMBOL1 1 -#include "SubHeader.h" diff --git a/clang-tools-extra/test/modularize/InputProblemsInconsistent/Header2.h b/clang-tools-extra/test/modularize/InputProblemsInconsistent/Header2.h deleted file mode 100644 index aa59ff9141a..00000000000 --- a/clang-tools-extra/test/modularize/InputProblemsInconsistent/Header2.h +++ /dev/null @@ -1,3 +0,0 @@ -// Set up so the declaration in SubHeader.h is not defined. -#define SYMBOL2 1 -#include "SubHeader.h" diff --git a/clang-tools-extra/test/modularize/Inputs/DuplicateHeader1.h b/clang-tools-extra/test/modularize/Inputs/DuplicateHeader1.h new file mode 100644 index 00000000000..2936b084dd4 --- /dev/null +++ b/clang-tools-extra/test/modularize/Inputs/DuplicateHeader1.h @@ -0,0 +1,2 @@ +// Same decl as in DuplicateHeader2.h. +typedef int TypeInt; diff --git a/clang-tools-extra/test/modularize/Inputs/DuplicateHeader2.h b/clang-tools-extra/test/modularize/Inputs/DuplicateHeader2.h new file mode 100644 index 00000000000..cef0ffeb12b --- /dev/null +++ b/clang-tools-extra/test/modularize/Inputs/DuplicateHeader2.h @@ -0,0 +1,2 @@ +// Same decl as in DuplicateHeader1.h. +typedef int TypeInt; diff --git a/clang-tools-extra/test/modularize/Inputs/InconsistentHeader1.h b/clang-tools-extra/test/modularize/Inputs/InconsistentHeader1.h new file mode 100644 index 00000000000..7dfcca948a1 --- /dev/null +++ b/clang-tools-extra/test/modularize/Inputs/InconsistentHeader1.h @@ -0,0 +1,4 @@ +// Define symbol such that a declaration exists when this header +// is included, but not when InconsistentHeader2.h is included. +#define SYMBOL1 1 +#include "InconsistentSubHeader.h" diff --git a/clang-tools-extra/test/modularize/Inputs/InconsistentHeader2.h b/clang-tools-extra/test/modularize/Inputs/InconsistentHeader2.h new file mode 100644 index 00000000000..a2bcae19c78 --- /dev/null +++ b/clang-tools-extra/test/modularize/Inputs/InconsistentHeader2.h @@ -0,0 +1,3 @@ +// Set up so the declaration in InconsistentSubHeader.h is not defined. +#define SYMBOL2 1 +#include "InconsistentSubHeader.h" diff --git a/clang-tools-extra/test/modularize/InputProblemsInconsistent/SubHeader.h b/clang-tools-extra/test/modularize/Inputs/InconsistentSubHeader.h index 1395e489c78..92e7d0367dc 100644 --- a/clang-tools-extra/test/modularize/InputProblemsInconsistent/SubHeader.h +++ b/clang-tools-extra/test/modularize/Inputs/InconsistentSubHeader.h @@ -1,4 +1,4 @@ -// Set up so TypeInt only defined during Header1.h include. +// Set up so TypeInt only defined during InconsistentHeader1.h include. #ifdef SYMBOL1 #define SYMBOL 1 #endif diff --git a/clang-tools-extra/test/modularize/InputNoProblems/SomeDecls.h b/clang-tools-extra/test/modularize/Inputs/SomeDecls.h index af4d994d916..af4d994d916 100644 --- a/clang-tools-extra/test/modularize/InputNoProblems/SomeDecls.h +++ b/clang-tools-extra/test/modularize/Inputs/SomeDecls.h diff --git a/clang-tools-extra/test/modularize/InputNoProblems/SomeTypes.h b/clang-tools-extra/test/modularize/Inputs/SomeTypes.h index 46c4316fc93..46c4316fc93 100644 --- a/clang-tools-extra/test/modularize/InputNoProblems/SomeTypes.h +++ b/clang-tools-extra/test/modularize/Inputs/SomeTypes.h diff --git a/clang-tools-extra/test/modularize/NoProblems.cpp b/clang-tools-extra/test/modularize/NoProblems.modularize index ad0a314fe43..c162b63326c 100644 --- a/clang-tools-extra/test/modularize/NoProblems.cpp +++ b/clang-tools-extra/test/modularize/NoProblems.modularize @@ -1,5 +1,5 @@ # RUN: modularize %s -x c++ # RUN: modularize -prefix=%p %s -x c++ -InputNoProblems/SomeTypes.h -InputNoProblems/SomeDecls.h +Inputs/SomeTypes.h +Inputs/SomeDecls.h diff --git a/clang-tools-extra/test/modularize/ProblemsDuplicate.cpp b/clang-tools-extra/test/modularize/ProblemsDuplicate.cpp deleted file mode 100644 index 85a29bf4efb..00000000000 --- a/clang-tools-extra/test/modularize/ProblemsDuplicate.cpp +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: modularize %s -x c++ 2>&1 | FileCheck %s - -InputProblemsDuplicate/Header1.h -InputProblemsDuplicate/Header2.h - -# CHECK: error: 'TypeInt' defined at both {{.*}}{{[/\\]}}InputProblemsDuplicate{{[/\\]}}Header1.h:2:13 and {{.*}}{{[/\\]}}InputProblemsDuplicate{{[/\\]}}Header2.h:2:13 diff --git a/clang-tools-extra/test/modularize/ProblemsDuplicate.modularize b/clang-tools-extra/test/modularize/ProblemsDuplicate.modularize new file mode 100644 index 00000000000..43469e08d06 --- /dev/null +++ b/clang-tools-extra/test/modularize/ProblemsDuplicate.modularize @@ -0,0 +1,6 @@ +# RUN: modularize %s -x c++ 2>&1 | FileCheck %s + +Inputs/DuplicateHeader1.h +Inputs/DuplicateHeader2.h + +# CHECK: error: 'TypeInt' defined at both {{.*}}{{[/\\]}}Inputs{{[/\\]}}DuplicateHeader1.h:2:13 and {{.*}}{{[/\\]}}Inputs{{[/\\]}}DuplicateHeader2.h:2:13 diff --git a/clang-tools-extra/test/modularize/ProblemsInconsistent.cpp b/clang-tools-extra/test/modularize/ProblemsInconsistent.cpp deleted file mode 100644 index d79601418d5..00000000000 --- a/clang-tools-extra/test/modularize/ProblemsInconsistent.cpp +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: modularize %s -x c++ 2>&1 | FileCheck %s - -InputProblemsInconsistent/Header1.h -InputProblemsInconsistent/Header2.h - -# CHECK: error: 'SYMBOL' defined at both {{.*}}{{[/\\]}}InputProblemsInconsistent{{[/\\]}}SubHeader.h:3:9 and {{.*}}{{[/\\]}}InputProblemsInconsistent/SubHeader.h:6:9 -# CHECK-NEXT: error: header '{{.*}}{{[/\\]}}InputProblemsInconsistent{{[/\\]}}SubHeader.h' has different contents dependening on how it was included -# CHECK-NEXT: note: 'SYMBOL' in {{.*}}{{[/\\]}}InputProblemsInconsistent{{[/\\]}}SubHeader.h at 3:9 not always provided -# CHECK-NEXT: note: 'SYMBOL' in {{.*}}{{[/\\]}}InputProblemsInconsistent{{[/\\]}}SubHeader.h at 6:9 not always provided -# CHECK-NEXT: note: 'TypeInt' in {{.*}}{{[/\\]}}InputProblemsInconsistent{{[/\\]}}SubHeader.h at 10:13 not always provided diff --git a/clang-tools-extra/test/modularize/ProblemsInconsistent.modularize b/clang-tools-extra/test/modularize/ProblemsInconsistent.modularize new file mode 100644 index 00000000000..dfe03208c87 --- /dev/null +++ b/clang-tools-extra/test/modularize/ProblemsInconsistent.modularize @@ -0,0 +1,10 @@ +# RUN: modularize %s -x c++ 2>&1 | FileCheck %s + +Inputs/InconsistentHeader1.h +Inputs/InconsistentHeader2.h + +# CHECK: error: 'SYMBOL' defined at both {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:3:9 and {{.*}}{{[/\\]}}Inputs/InconsistentSubHeader.h:6:9 +# CHECK-NEXT: error: header '{{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h' has different contents dependening on how it was included +# CHECK-NEXT: note: 'SYMBOL' in {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h at 3:9 not always provided +# CHECK-NEXT: note: 'SYMBOL' in {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h at 6:9 not always provided +# CHECK-NEXT: note: 'TypeInt' in {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h at 10:13 not always provided |
