[PATCH] D127009: [test] Modify test case so it verifies the fix from D126396

Fangrui Song via Phabricator via cfe-commits cfe-commits at lists.llvm.org
Fri Jun 3 17:54:13 PDT 2022


This revision was automatically updated to reflect the committed changes.
Closed by commit rG490990bb1f65: [test] Modify test to verify D126396 (Clean "./" from __FILE__ expansion) (authored by ppluzhnikov, committed by MaskRay).

Changed prior to commit:
  https://reviews.llvm.org/D127009?vs=434202&id=434221#toc

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D127009/new/

https://reviews.llvm.org/D127009

Files:
  clang/test/Preprocessor/file_test.c


Index: clang/test/Preprocessor/file_test.c
===================================================================
--- clang/test/Preprocessor/file_test.c
+++ clang/test/Preprocessor/file_test.c
@@ -8,9 +8,16 @@
 // RUN: %clang -E -fmacro-prefix-map=%p/= -target x86_64-pc-win32 -c -o - %s | FileCheck %s --check-prefix CHECK-WINDOWS
 // RUN: %clang -E -ffile-prefix-map=%p/= -target x86_64-pc-win32 -c -o - %s | FileCheck %s --check-prefix CHECK-WINDOWS
 // RUN: %clang -E -ffile-reproducible -target x86_64-pc-win32 -c -o - %s | FileCheck %s --check-prefix CHECK-WINDOWS-REPRODUCIBLE
+// RUN: %clang -E -ffile-reproducible -target x86_64-pc-linux-gnu -c -o - %s | FileCheck %s --check-prefix CHECK-LINUX-REPRODUCIBLE
+
+/// Clang-format wants to do something unreasonable to this file.
+// clang-format off
 
 filename: __FILE__
-#include "Inputs/include-file-test/file_test.h"
+
+/// This line tests that the __FILE__ in included header is canonicalized
+/// (has "./" removed).
+#include "./Inputs/./include-file-test/file_test.h"
 
 // CHECK: filename: "/UNLIKELY_PATH/empty/file_test.c"
 // CHECK: filename: "/UNLIKELY_PATH/empty/Inputs/include-file-test/file_test.h"
@@ -23,7 +30,7 @@
 // CHECK-EVIL-NOT: filename:
 
 // CHECK-REMOVE: filename: "file_test.c"
-// CHECK-REMOVE: filename: "Inputs/include-file-test/file_test.h"
+// CHECK-REMOVE: filename: "{{.*}}Inputs/{{.*}}include-file-test/file_test.h"
 // CHECK-REMOVE: basefile: "file_test.c"
 // CHECK-REMOVE-NOT: filename:
 
@@ -32,7 +39,12 @@
 // CHECK-WINDOWS: basefile: "file_test.c"
 // CHECK-WINDOWS-NOT: filename:
 
-// CHECK-WINDOWS-REPRODUCIBLE: filename: "{{[^/]*}}file_test.c"
-// CHECK-WINDOWS-REPRODUCIBLE: filename: "{{[^/]*}}Inputs\\include-file-test\\file_test.h"
-// CHECK-WINDOWS-REPRODUCIBLE: basefile: "{{[^/]*}}file_test.c"
+// CHECK-WINDOWS-REPRODUCIBLE: filename: "{{.*}}\\file_test.c"
+// CHECK-WINDOWS-REPRODUCIBLE: filename: "{{.*}}\\Inputs\\include-file-test\\file_test.h"
+// CHECK-WINDOWS-REPRODUCIBLE: basefile: "{{.*}}\\file_test.c"
 // CHECK-WINDOWS-REPRODUCIBLE-NOT: filename:
+
+// CHECK-LINUX-REPRODUCIBLE: filename: "{{.*}}/file_test.c"
+// CHECK-LINUX-REPRODUCIBLE: filename: "{{.*}}/Inputs/include-file-test/file_test.h"
+// CHECK-LINUX-REPRODUCIBLE: basefile: "{{.*}}/file_test.c"
+// CHECK-LINUX-REPRODUCIBLE-NOT: filename:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D127009.434221.patch
Type: text/x-patch
Size: 2322 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220604/786c377c/attachment.bin>


More information about the cfe-commits mailing list