[clang-tools-extra] r193805 - Rename Input to Inputs, for consistency with other tests.

Sean Silva silvas at purdue.edu
Thu Oct 31 15:14:01 PDT 2013


I feel like we should have this rule in a doc somewhere
(CodingStandards.rst? it's not really about "code" per se).

-- Sean Silva


On Thu, Oct 31, 2013 at 5:29 PM, Dan Gohman <dan433584 at gmail.com> wrote:

> Author: djg
> Date: Thu Oct 31 16:29:44 2013
> New Revision: 193805
>
> URL: http://llvm.org/viewvc/llvm-project?rev=193805&view=rev
> Log:
> Rename Input to Inputs, for consistency with other tests.
>
> Added:
>     clang-tools-extra/trunk/test/pp-trace/Inputs/
>       - copied from r193801, clang-tools-extra/trunk/test/pp-trace/Input/
> Removed:
>     clang-tools-extra/trunk/test/pp-trace/Input/
> Modified:
>     clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp
>
> 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=193805&r1=193804&r2=193805&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 Thu Oct 31
> 16:29:44 2013
> @@ -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: ...
>
>
> _______________________________________________
> 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/20131031/45e8330f/attachment.html>


More information about the cfe-commits mailing list