4 files changed, 19 insertions, 19 deletions
diff --git a/clang-tools-extra/test/pp-trace/Input/Level1A.h b/clang-tools-extra/test/pp-trace/Inputs/Level1A.h
index 165efc738ea..165efc738ea 100644
--- a/clang-tools-extra/test/pp-trace/Input/Level1A.h
+++ b/clang-tools-extra/test/pp-trace/Inputs/Level1A.h
diff --git a/clang-tools-extra/test/pp-trace/Input/Level1B.h b/clang-tools-extra/test/pp-trace/Inputs/Level1B.h
index 4f15d6c37d1..4f15d6c37d1 100644
--- a/clang-tools-extra/test/pp-trace/Input/Level1B.h
+++ b/clang-tools-extra/test/pp-trace/Inputs/Level1B.h
diff --git a/clang-tools-extra/test/pp-trace/Input/Level2A.h b/clang-tools-extra/test/pp-trace/Inputs/Level2A.h
index 9a355df06a8..9a355df06a8 100644
--- a/clang-tools-extra/test/pp-trace/Input/Level2A.h
+++ b/clang-tools-extra/test/pp-trace/Inputs/Level2A.h
diff --git a/clang-tools-extra/test/pp-trace/pp-trace-include.cpp b/clang-tools-extra/test/pp-trace/pp-trace-include.cpp
index 26ea24b3c65..a715c51747a 100644
--- a/clang-tools-extra/test/pp-trace/pp-trace-include.cpp
+++ b/clang-tools-extra/test/pp-trace/pp-trace-include.cpp
@@ -1,7 +1,7 @@
 // RUN: pp-trace %s -undef -target x86_64 -std=c++11 | FileCheck --strict-whitespace %s
 
-#include "Input/Level1A.h"
-#include "Input/Level1B.h"
+#include "Inputs/Level1A.h"
+#include "Inputs/Level1B.h"
 
 // CHECK: ---
 // CHECK-NEXT: - Callback: FileChanged
@@ -51,15 +51,15 @@
 // CHECK-NEXT:   PrevFID: (getFileEntryForID failed)
 // CHECK-NEXT: - Callback: InclusionDirective
 // CHECK-NEXT:   IncludeTok: include
-// CHECK-NEXT:   FileName: "Input/Level1A.h"
+// CHECK-NEXT:   FileName: "Inputs/Level1A.h"
 // CHECK-NEXT:   IsAngled: false
-// CHECK-NEXT:   FilenameRange: "Input/Level1A.h"
-// CHECK-NEXT:   File: "{{.*}}{{[/\\]}}Input/Level1A.h"
+// CHECK-NEXT:   FilenameRange: "Inputs/Level1A.h"
+// CHECK-NEXT:   File: "{{.*}}{{[/\\]}}Inputs/Level1A.h"
 // CHECK-NEXT:   SearchPath: "{{.*}}{{[/\\]}}pp-trace"
-// CHECK-NEXT:   RelativePath: "Input/Level1A.h"
+// CHECK-NEXT:   RelativePath: "Inputs/Level1A.h"
 // CHECK-NEXT:   Imported: (null)
 // CHECK-NEXT: - Callback: FileChanged
-// CHECK-NEXT:   Loc: "{{.*}}{{[/\\]}}Input/Level1A.h:1:1"
+// CHECK-NEXT:   Loc: "{{.*}}{{[/\\]}}Inputs/Level1A.h:1:1"
 // CHECK-NEXT:   Reason: EnterFile
 // CHECK-NEXT:   FileType: C_User
 // CHECK-NEXT:   PrevFID: (invalid)
@@ -68,12 +68,12 @@
 // CHECK-NEXT:   FileName: "Level2A.h"
 // CHECK-NEXT:   IsAngled: false
 // CHECK-NEXT:   FilenameRange: "Level2A.h"
-// CHECK-NEXT:   File: "{{.*}}{{[/\\]}}Input/Level2A.h"
-// CHECK-NEXT:   SearchPath: "{{.*}}{{[/\\]}}Input"
+// CHECK-NEXT:   File: "{{.*}}{{[/\\]}}Inputs/Level2A.h"
+// CHECK-NEXT:   SearchPath: "{{.*}}{{[/\\]}}Inputs"
 // CHECK-NEXT:   RelativePath: "Level2A.h"
 // CHECK-NEXT:   Imported: (null)
 // CHECK-NEXT: - Callback: FileChanged
-// CHECK-NEXT:   Loc: "{{.*}}{{[/\\]}}Input/Level2A.h:1:1"
+// CHECK-NEXT:   Loc: "{{.*}}{{[/\\]}}Inputs/Level2A.h:1:1"
 // CHECK-NEXT:   Reason: EnterFile
 // CHECK-NEXT:   FileType: C_User
 // CHECK-NEXT:   PrevFID: (invalid)
@@ -81,10 +81,10 @@
 // CHECK-NEXT:   MacroNameTok: MACRO_2A
 // CHECK-NEXT:   MacroDirective: MD_Define
 // CHECK-NEXT: - Callback: FileChanged
-// CHECK-NEXT:   Loc: "{{.*}}{{[/\\]}}Input/Level1A.h:2:1"
+// CHECK-NEXT:   Loc: "{{.*}}{{[/\\]}}Inputs/Level1A.h:2:1"
 // CHECK-NEXT:   Reason: ExitFile
 // CHECK-NEXT:   FileType: C_User
-// CHECK-NEXT:   PrevFID: "{{.*}}{{[/\\]}}Input/Level2A.h"
+// CHECK-NEXT:   PrevFID: "{{.*}}{{[/\\]}}Inputs/Level2A.h"
 // CHECK-NEXT: - Callback: MacroDefined
 // CHECK-NEXT:   MacroNameTok: MACRO_1A
 // CHECK-NEXT:   MacroDirective: MD_Define
@@ -92,18 +92,18 @@
 // CHECK-NEXT:   Loc: "{{.*}}{{[/\\]}}pp-trace-include.cpp:4:1"
 // CHECK-NEXT:   Reason: ExitFile
 // CHECK-NEXT:   FileType: C_User
-// CHECK-NEXT:   PrevFID: "{{.*}}{{[/\\]}}Input/Level1A.h"
+// CHECK-NEXT:   PrevFID: "{{.*}}{{[/\\]}}Inputs/Level1A.h"
 // CHECK-NEXT: - Callback: InclusionDirective
 // CHECK-NEXT:   IncludeTok: include
-// CHECK-NEXT:   FileName: "Input/Level1B.h"
+// CHECK-NEXT:   FileName: "Inputs/Level1B.h"
 // CHECK-NEXT:   IsAngled: false
-// CHECK-NEXT:   FilenameRange: "Input/Level1B.h"
-// CHECK-NEXT:   File: "{{.*}}{{[/\\]}}Input/Level1B.h"
+// CHECK-NEXT:   FilenameRange: "Inputs/Level1B.h"
+// CHECK-NEXT:   File: "{{.*}}{{[/\\]}}Inputs/Level1B.h"
 // CHECK-NEXT:   SearchPath: "{{.*}}{{[/\\]}}pp-trace"
-// CHECK-NEXT:   RelativePath: "Input/Level1B.h"
+// CHECK-NEXT:   RelativePath: "Inputs/Level1B.h"
 // CHECK-NEXT:   Imported: (null)
 // CHECK-NEXT: - Callback: FileChanged
-// CHECK-NEXT:   Loc: "{{.*}}{{[/\\]}}Input/Level1B.h:1:1"
+// CHECK-NEXT:   Loc: "{{.*}}{{[/\\]}}Inputs/Level1B.h:1:1"
 // CHECK-NEXT:   Reason: EnterFile
 // CHECK-NEXT:   FileType: C_User
 // CHECK-NEXT:   PrevFID: (invalid)
@@ -114,6 +114,6 @@
 // CHECK-NEXT:   Loc: "{{.*}}{{[/\\]}}pp-trace-include.cpp:5:1"
 // CHECK-NEXT:   Reason: ExitFile
 // CHECK-NEXT:   FileType: C_User
-// CHECK-NEXT:   PrevFID: "{{.*}}{{[/\\]}}Input/Level1B.h"
+// CHECK-NEXT:   PrevFID: "{{.*}}{{[/\\]}}Inputs/Level1B.h"
 // CHECK-NEXT: - Callback: EndOfMainFile
 // CHECK-NEXT: ...