[clang-tools-extra] r194504 - Extended moduleImport test to test a module with more than one path component. This required a change to the includes test, because of the change to the headers.
Sean Silva
silvas at purdue.edu
Tue Nov 12 17:14:06 PST 2013
Thanks for this work beefing up the tests.
-- Sean Silva
On Tue, Nov 12, 2013 at 2:50 PM, John Thompson <
John.Thompson.JTSoftware at gmail.com> wrote:
> Author: jtsoftware
> Date: Tue Nov 12 13:50:49 2013
> New Revision: 194504
>
> URL: http://llvm.org/viewvc/llvm-project?rev=194504&view=rev
> Log:
> Extended moduleImport test to test a module with more than one path
> component. This required a change to the includes test, because of the
> change to the headers.
>
> Added:
> clang-tools-extra/trunk/test/pp-trace/Inputs/Level2B.h
> Modified:
> clang-tools-extra/trunk/test/pp-trace/Inputs/Level1B.h
> clang-tools-extra/trunk/test/pp-trace/Inputs/ModularizeList.txt
> clang-tools-extra/trunk/test/pp-trace/Inputs/module.map
> clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp
> clang-tools-extra/trunk/test/pp-trace/pp-trace-modules.cpp
>
> Modified: clang-tools-extra/trunk/test/pp-trace/Inputs/Level1B.h
> URL:
> http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/Inputs/Level1B.h?rev=194504&r1=194503&r2=194504&view=diff
>
> ==============================================================================
> --- clang-tools-extra/trunk/test/pp-trace/Inputs/Level1B.h (original)
> +++ clang-tools-extra/trunk/test/pp-trace/Inputs/Level1B.h Tue Nov 12
> 13:50:49 2013
> @@ -1 +1,2 @@
> +#include "Level2B.h"
> #define MACRO_1B 1
>
> Added: clang-tools-extra/trunk/test/pp-trace/Inputs/Level2B.h
> URL:
> http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/Inputs/Level2B.h?rev=194504&view=auto
>
> ==============================================================================
> --- clang-tools-extra/trunk/test/pp-trace/Inputs/Level2B.h (added)
> +++ clang-tools-extra/trunk/test/pp-trace/Inputs/Level2B.h Tue Nov 12
> 13:50:49 2013
> @@ -0,0 +1 @@
> +#define MACRO_2B 1
>
> Modified: clang-tools-extra/trunk/test/pp-trace/Inputs/ModularizeList.txt
> URL:
> http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/Inputs/ModularizeList.txt?rev=194504&r1=194503&r2=194504&view=diff
>
> ==============================================================================
> --- clang-tools-extra/trunk/test/pp-trace/Inputs/ModularizeList.txt
> (original)
> +++ clang-tools-extra/trunk/test/pp-trace/Inputs/ModularizeList.txt Tue
> Nov 12 13:50:49 2013
> @@ -1,3 +1,4 @@
> Level1A.h
> Level1B.h
> Level2A.h
> +Level2B.h
>
> Modified: clang-tools-extra/trunk/test/pp-trace/Inputs/module.map
> URL:
> http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/Inputs/module.map?rev=194504&r1=194503&r2=194504&view=diff
>
> ==============================================================================
> --- clang-tools-extra/trunk/test/pp-trace/Inputs/module.map (original)
> +++ clang-tools-extra/trunk/test/pp-trace/Inputs/module.map Tue Nov 12
> 13:50:49 2013
> @@ -1,5 +1,4 @@
> // module.map
> -// Generated by: modularize -module-map-path=module.map ModularizeList.txt
>
> module Level1A {
> header "Level1A.h"
> @@ -8,6 +7,10 @@ module Level1A {
> module Level1B {
> header "Level1B.h"
> export *
> + module Level2B {
> + header "Level2B.h"
> + export *
> + }
> }
> module Level2A {
> header "Level2A.h"
>
> Modified: clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp?rev=194504&r1=194503&r2=194504&view=diff
>
> ==============================================================================
> --- clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp (original)
> +++ clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp Tue Nov 12
> 13:50:49 2013
> @@ -107,6 +107,28 @@
> // CHECK-NEXT: Reason: EnterFile
> // CHECK-NEXT: FileType: C_User
> // CHECK-NEXT: PrevFID: (invalid)
> +// CHECK-NEXT: - Callback: InclusionDirective
> +// CHECK-NEXT: IncludeTok: include
> +// CHECK-NEXT: FileName: "Level2B.h"
> +// CHECK-NEXT: IsAngled: false
> +// CHECK-NEXT: FilenameRange: "Level2B.h"
> +// CHECK-NEXT: File: "{{.*}}{{[/\\]}}Inputs/Level2B.h"
> +// CHECK-NEXT: SearchPath: "{{.*}}{{[/\\]}}Inputs"
> +// CHECK-NEXT: RelativePath: "Level2B.h"
> +// CHECK-NEXT: Imported: (null)
> +// CHECK-NEXT: - Callback: FileChanged
> +// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}Inputs/Level2B.h:1:1"
> +// CHECK-NEXT: Reason: EnterFile
> +// CHECK-NEXT: FileType: C_User
> +// CHECK-NEXT: PrevFID: (invalid)
> +// CHECK-NEXT: - Callback: MacroDefined
> +// CHECK-NEXT: MacroNameTok: MACRO_2B
> +// CHECK-NEXT: MacroDirective: MD_Define
> +// CHECK-NEXT: - Callback: FileChanged
> +// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}Inputs/Level1B.h:2:1"
> +// CHECK-NEXT: Reason: ExitFile
> +// CHECK-NEXT: FileType: C_User
> +// CHECK-NEXT: PrevFID: "{{.*}}{{[/\\]}}Inputs/Level2B.h"
> // CHECK-NEXT: - Callback: MacroDefined
> // CHECK-NEXT: MacroNameTok: MACRO_1B
> // CHECK-NEXT: MacroDirective: MD_Define
>
> Modified: clang-tools-extra/trunk/test/pp-trace/pp-trace-modules.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/pp-trace-modules.cpp?rev=194504&r1=194503&r2=194504&view=diff
>
> ==============================================================================
> --- clang-tools-extra/trunk/test/pp-trace/pp-trace-modules.cpp (original)
> +++ clang-tools-extra/trunk/test/pp-trace/pp-trace-modules.cpp Tue Nov 12
> 13:50:49 2013
> @@ -1,11 +1,16 @@
> // RUN: pp-trace -ignore FileChanged,MacroDefined %s -x objective-c++
> -undef -target x86_64 -std=c++11 -fmodules -fcxx-modules
> -fmodules-cache-path=%t -I%S -I%S/Input | FileCheck --strict-whitespace %s
>
> @import Level1A;
> + at import Level1B.Level2B;
>
> // CHECK: ---
> // CHECK-NEXT: - Callback: moduleImport
> // CHECK-NEXT: ImportLoc: "{{.*}}{{[/\\]}}pp-trace-modules.cpp:3:2"
> // CHECK-NEXT: Path: [{Name: Level1A, Loc:
> "{{.*}}{{[/\\]}}pp-trace-modules.cpp:3:9"}]
> // CHECK-NEXT: Imported: Level1A
> +// CHECK-NEXT: - Callback: moduleImport
> +// CHECK-NEXT: ImportLoc: "{{.*}}{{[/\\]}}pp-trace-modules.cpp:4:2"
> +// CHECK-NEXT: Path: [{Name: Level1B, Loc:
> "{{.*}}{{[/\\]}}pp-trace-modules.cpp:4:9"}, {Name: Level2B, Loc:
> "{{.*}}{{[/\\]}}pp-trace-modules.cpp:4:17"}]
> +// CHECK-NEXT: Imported: Level2B
> // CHECK-NEXT: - Callback: EndOfMainFile
> // CHECK-NEXT: ...
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20131112/6700e165/attachment.html>
More information about the cfe-commits
mailing list