<div dir="ltr">Thanks for this work beefing up the tests.<div><br></div><div>-- Sean Silva</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Nov 12, 2013 at 2:50 PM, John Thompson <span dir="ltr"><<a href="mailto:John.Thompson.JTSoftware@gmail.com" target="_blank">John.Thompson.JTSoftware@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: jtsoftware<br>
Date: Tue Nov 12 13:50:49 2013<br>
New Revision: 194504<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=194504&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=194504&view=rev</a><br>
Log:<br>
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.<br>
<br>
Added:<br>
clang-tools-extra/trunk/test/pp-trace/Inputs/Level2B.h<br>
Modified:<br>
clang-tools-extra/trunk/test/pp-trace/Inputs/Level1B.h<br>
clang-tools-extra/trunk/test/pp-trace/Inputs/ModularizeList.txt<br>
clang-tools-extra/trunk/test/pp-trace/Inputs/module.map<br>
clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp<br>
clang-tools-extra/trunk/test/pp-trace/pp-trace-modules.cpp<br>
<br>
Modified: clang-tools-extra/trunk/test/pp-trace/Inputs/Level1B.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/Inputs/Level1B.h?rev=194504&r1=194503&r2=194504&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/Inputs/Level1B.h?rev=194504&r1=194503&r2=194504&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/pp-trace/Inputs/Level1B.h (original)<br>
+++ clang-tools-extra/trunk/test/pp-trace/Inputs/Level1B.h Tue Nov 12 13:50:49 2013<br>
@@ -1 +1,2 @@<br>
+#include "Level2B.h"<br>
#define MACRO_1B 1<br>
<br>
Added: clang-tools-extra/trunk/test/pp-trace/Inputs/Level2B.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/Inputs/Level2B.h?rev=194504&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/Inputs/Level2B.h?rev=194504&view=auto</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/pp-trace/Inputs/Level2B.h (added)<br>
+++ clang-tools-extra/trunk/test/pp-trace/Inputs/Level2B.h Tue Nov 12 13:50:49 2013<br>
@@ -0,0 +1 @@<br>
+#define MACRO_2B 1<br>
<br>
Modified: clang-tools-extra/trunk/test/pp-trace/Inputs/ModularizeList.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/Inputs/ModularizeList.txt?rev=194504&r1=194503&r2=194504&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/Inputs/ModularizeList.txt?rev=194504&r1=194503&r2=194504&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/pp-trace/Inputs/ModularizeList.txt (original)<br>
+++ clang-tools-extra/trunk/test/pp-trace/Inputs/ModularizeList.txt Tue Nov 12 13:50:49 2013<br>
@@ -1,3 +1,4 @@<br>
Level1A.h<br>
Level1B.h<br>
Level2A.h<br>
+Level2B.h<br>
<br>
Modified: clang-tools-extra/trunk/test/pp-trace/Inputs/module.map<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/Inputs/module.map?rev=194504&r1=194503&r2=194504&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/Inputs/module.map?rev=194504&r1=194503&r2=194504&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/pp-trace/Inputs/module.map (original)<br>
+++ clang-tools-extra/trunk/test/pp-trace/Inputs/module.map Tue Nov 12 13:50:49 2013<br>
@@ -1,5 +1,4 @@<br>
// module.map<br>
-// Generated by: modularize -module-map-path=module.map ModularizeList.txt<br>
<br>
module Level1A {<br>
header "Level1A.h"<br>
@@ -8,6 +7,10 @@ module Level1A {<br>
module Level1B {<br>
header "Level1B.h"<br>
export *<br>
+ module Level2B {<br>
+ header "Level2B.h"<br>
+ export *<br>
+ }<br>
}<br>
module Level2A {<br>
header "Level2A.h"<br>
<br>
Modified: clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp<br>
URL: <a href="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" target="_blank">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</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp (original)<br>
+++ clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp Tue Nov 12 13:50:49 2013<br>
@@ -107,6 +107,28 @@<br>
// CHECK-NEXT: Reason: EnterFile<br>
// CHECK-NEXT: FileType: C_User<br>
// CHECK-NEXT: PrevFID: (invalid)<br>
+// CHECK-NEXT: - Callback: InclusionDirective<br>
+// CHECK-NEXT: IncludeTok: include<br>
+// CHECK-NEXT: FileName: "Level2B.h"<br>
+// CHECK-NEXT: IsAngled: false<br>
+// CHECK-NEXT: FilenameRange: "Level2B.h"<br>
+// CHECK-NEXT: File: "{{.*}}{{[/\\]}}Inputs/Level2B.h"<br>
+// CHECK-NEXT: SearchPath: "{{.*}}{{[/\\]}}Inputs"<br>
+// CHECK-NEXT: RelativePath: "Level2B.h"<br>
+// CHECK-NEXT: Imported: (null)<br>
+// CHECK-NEXT: - Callback: FileChanged<br>
+// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}Inputs/Level2B.h:1:1"<br>
+// CHECK-NEXT: Reason: EnterFile<br>
+// CHECK-NEXT: FileType: C_User<br>
+// CHECK-NEXT: PrevFID: (invalid)<br>
+// CHECK-NEXT: - Callback: MacroDefined<br>
+// CHECK-NEXT: MacroNameTok: MACRO_2B<br>
+// CHECK-NEXT: MacroDirective: MD_Define<br>
+// CHECK-NEXT: - Callback: FileChanged<br>
+// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}Inputs/Level1B.h:2:1"<br>
+// CHECK-NEXT: Reason: ExitFile<br>
+// CHECK-NEXT: FileType: C_User<br>
+// CHECK-NEXT: PrevFID: "{{.*}}{{[/\\]}}Inputs/Level2B.h"<br>
// CHECK-NEXT: - Callback: MacroDefined<br>
// CHECK-NEXT: MacroNameTok: MACRO_1B<br>
// CHECK-NEXT: MacroDirective: MD_Define<br>
<br>
Modified: clang-tools-extra/trunk/test/pp-trace/pp-trace-modules.cpp<br>
URL: <a href="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" target="_blank">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</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/pp-trace/pp-trace-modules.cpp (original)<br>
+++ clang-tools-extra/trunk/test/pp-trace/pp-trace-modules.cpp Tue Nov 12 13:50:49 2013<br>
@@ -1,11 +1,16 @@<br>
// 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<br>
<br>
@import Level1A;<br>
+@import Level1B.Level2B;<br>
<br>
// CHECK: ---<br>
// CHECK-NEXT: - Callback: moduleImport<br>
// CHECK-NEXT: ImportLoc: "{{.*}}{{[/\\]}}pp-trace-modules.cpp:3:2"<br>
// CHECK-NEXT: Path: [{Name: Level1A, Loc: "{{.*}}{{[/\\]}}pp-trace-modules.cpp:3:9"}]<br>
// CHECK-NEXT: Imported: Level1A<br>
+// CHECK-NEXT: - Callback: moduleImport<br>
+// CHECK-NEXT: ImportLoc: "{{.*}}{{[/\\]}}pp-trace-modules.cpp:4:2"<br>
+// CHECK-NEXT: Path: [{Name: Level1B, Loc: "{{.*}}{{[/\\]}}pp-trace-modules.cpp:4:9"}, {Name: Level2B, Loc: "{{.*}}{{[/\\]}}pp-trace-modules.cpp:4:17"}]<br>
+// CHECK-NEXT: Imported: Level2B<br>
// CHECK-NEXT: - Callback: EndOfMainFile<br>
// CHECK-NEXT: ...<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>