diff options
| author | Kristina Brooks <notstina@gmail.com> | 2019-05-16 03:30:08 +0000 |
|---|---|---|
| committer | Kristina Brooks <notstina@gmail.com> | 2019-05-16 03:30:08 +0000 |
| commit | 9d65624bf6577ad597d80cf4dd9d9aa8d65dec61 (patch) | |
| tree | 848980039ad43f27889814ac3c54ed9ad61dd30f /clang/test | |
| parent | 5c073a94f9c25e73d78dbeb8eb7b1b3a60d7dd1f (diff) | |
| download | bcm5719-llvm-9d65624bf6577ad597d80cf4dd9d9aa8d65dec61.tar.gz bcm5719-llvm-9d65624bf6577ad597d80cf4dd9d9aa8d65dec61.zip | |
Revert r360833 until I can work out the issue with Win32 bots
This reverts "r360833: [Clang][PP] Add the __FILE_NAME__ builtin macro."
The tests are failing on Windows bots, reverting the patchset until I can
work out why.
llvm-svn: 360842
Diffstat (limited to 'clang/test')
5 files changed, 0 insertions, 53 deletions
diff --git a/clang/test/Preprocessor/Inputs/include-subdir/file_name_macro_include.h b/clang/test/Preprocessor/Inputs/include-subdir/file_name_macro_include.h deleted file mode 100644 index e974799b1f6..00000000000 --- a/clang/test/Preprocessor/Inputs/include-subdir/file_name_macro_include.h +++ /dev/null @@ -1,6 +0,0 @@ -3: __FILE_NAME__ -4: "file_name_macro_include.h" -#ifdef MS -// Should be the same even when included with backslash. -5: __FILE_NAME__ -#endif diff --git a/clang/test/Preprocessor/Inputs/include-subdir/h b/clang/test/Preprocessor/Inputs/include-subdir/h deleted file mode 100644 index b9839684e89..00000000000 --- a/clang/test/Preprocessor/Inputs/include-subdir/h +++ /dev/null @@ -1 +0,0 @@ -6: __FILE_NAME__ diff --git a/clang/test/Preprocessor/Inputs/include-subdir/subdir1/hdr1.h b/clang/test/Preprocessor/Inputs/include-subdir/subdir1/hdr1.h deleted file mode 100644 index f793be596c7..00000000000 --- a/clang/test/Preprocessor/Inputs/include-subdir/subdir1/hdr1.h +++ /dev/null @@ -1 +0,0 @@ -7: __FILE_NAME__ diff --git a/clang/test/Preprocessor/Inputs/include-subdir/subdir1/hdr2.h b/clang/test/Preprocessor/Inputs/include-subdir/subdir1/hdr2.h deleted file mode 100644 index 66860acc64d..00000000000 --- a/clang/test/Preprocessor/Inputs/include-subdir/subdir1/hdr2.h +++ /dev/null @@ -1 +0,0 @@ -8: __FILE_NAME__ diff --git a/clang/test/Preprocessor/file_name_macro.c b/clang/test/Preprocessor/file_name_macro.c deleted file mode 100644 index 9dc9dc5684c..00000000000 --- a/clang/test/Preprocessor/file_name_macro.c +++ /dev/null @@ -1,44 +0,0 @@ -// RUN: %clang_cc1 -E %s -I%S/Inputs | FileCheck -strict-whitespace %s -// RUN: %clang_cc1 -fms-compatibility -DMS -E %s -I%S/Inputs | FileCheck -check-prefix=CHECK-MS -strict-whitespace %s -// RUN: %clang_cc1 -E %s -I%S/Inputs -DBADINC -verify - -#ifdef BADINC - -// Paranoia. - -__FILE_NAME__ -#include <include-subdir/> // expected-error {{file not found}} -__FILE_NAME__ - -#else - -// Reference. -1: "file_name_macro.c" - -// Ensure it expands correctly for this file. -2: __FILE_NAME__ - -// CHECK: {{^}}1: "file_name_macro.c" -// CHECK: {{^}}2: "file_name_macro.c" - -// Test if inclusion works right. -#ifdef MS -#include <include-subdir\file_name_macro_include.h> -// MS compatibility allows for mixed separators in paths. -#include <include-subdir/subdir1\hdr1.h> -#include <include-subdir\subdir1/hdr2.h> -#else -#include <include-subdir/file_name_macro_include.h> -#endif - -#include <include-subdir/h> - -// CHECK: {{^}}3: "file_name_macro_include.h" -// CHECK: {{^}}4: "file_name_macro_include.h" -// CHECK-NOT: {{^}}5: "file_name_macro_include.h" -// CHECK-MS: {{^}}5: "file_name_macro_include.h" -// CHECK: {{^}}6: "h" -// CHECK-MS: {{^}}7: "hdr1.h" -// CHECK-MS: {{^}}8: "hdr2.h" - -#endif |
