From db98c06f11ad1996fc0690c812df7854a0bb0aa2 Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Tue, 18 Oct 2022 08:45:15 -0700 Subject: [PATCH] [ubsan][test] Make some tests have shorter file names We're hitting path size limits on Windows on these tests. As a workaround, make the file names shorter. Reviewed By: vitalybuka Differential Revision: https://reviews.llvm.org/D136113 --- ...on-lvalue.cpp => align-assume-attribute-align_value-on-lvalue.cpp} | 4 ++-- ...aramvar.cpp => align-assume-attribute-align_value-on-paramvar.cpp} | 4 ++-- ...pp => align-assume-attribute-alloc_align-on-function-variable.cpp} | 4 ++-- ...unction.cpp => align-assume-attribute-alloc_align-on-function.cpp} | 4 ++-- ... align-assume-attribute-assume_aligned-on-function-two-params.cpp} | 4 ++-- ...tion.cpp => align-assume-attribute-assume_aligned-on-function.cpp} | 4 ++-- ... => align-assume-builtin_assume_aligned-three-params-variable.cpp} | 2 +- ...arams.cpp => align-assume-builtin_assume_aligned-three-params.cpp} | 2 +- ...-params.cpp => align-assume-builtin_assume_aligned-two-params.cpp} | 2 +- ...lignment-assumption-ignorelist.cpp => align-assume-ignorelist.cpp} | 2 +- .../{alignment-assumption-openmp.cpp => align-assume-openmp.cpp} | 2 +- .../{alignment-assumption-summary.cpp => align-assume-summary.cpp} | 0 12 files changed, 17 insertions(+), 17 deletions(-) rename compiler-rt/test/ubsan/TestCases/Pointer/{alignment-assumption-attribute-align_value-on-lvalue.cpp => align-assume-attribute-align_value-on-lvalue.cpp} (87%) rename compiler-rt/test/ubsan/TestCases/Pointer/{alignment-assumption-attribute-align_value-on-paramvar.cpp => align-assume-attribute-align_value-on-paramvar.cpp} (87%) rename compiler-rt/test/ubsan/TestCases/Pointer/{alignment-assumption-attribute-alloc_align-on-function-variable.cpp => align-assume-attribute-alloc_align-on-function-variable.cpp} (87%) rename compiler-rt/test/ubsan/TestCases/Pointer/{alignment-assumption-attribute-alloc_align-on-function.cpp => align-assume-attribute-alloc_align-on-function.cpp} (87%) rename compiler-rt/test/ubsan/TestCases/Pointer/{alignment-assumption-attribute-assume_aligned-on-function-two-params.cpp => align-assume-attribute-assume_aligned-on-function-two-params.cpp} (86%) rename compiler-rt/test/ubsan/TestCases/Pointer/{alignment-assumption-attribute-assume_aligned-on-function.cpp => align-assume-attribute-assume_aligned-on-function.cpp} (87%) rename compiler-rt/test/ubsan/TestCases/Pointer/{alignment-assumption-builtin_assume_aligned-three-params-variable.cpp => align-assume-builtin_assume_aligned-three-params-variable.cpp} (91%) rename compiler-rt/test/ubsan/TestCases/Pointer/{alignment-assumption-builtin_assume_aligned-three-params.cpp => align-assume-builtin_assume_aligned-three-params.cpp} (90%) rename compiler-rt/test/ubsan/TestCases/Pointer/{alignment-assumption-builtin_assume_aligned-two-params.cpp => align-assume-builtin_assume_aligned-two-params.cpp} (91%) rename compiler-rt/test/ubsan/TestCases/Pointer/{alignment-assumption-ignorelist.cpp => align-assume-ignorelist.cpp} (80%) rename compiler-rt/test/ubsan/TestCases/Pointer/{alignment-assumption-openmp.cpp => align-assume-openmp.cpp} (92%) rename compiler-rt/test/ubsan/TestCases/Pointer/{alignment-assumption-summary.cpp => align-assume-summary.cpp} (100%) diff --git a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-align_value-on-lvalue.cpp b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-align_value-on-lvalue.cpp similarity index 87% rename from compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-align_value-on-lvalue.cpp rename to compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-align_value-on-lvalue.cpp index 97d4b46..a96a5ca 100644 --- a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-align_value-on-lvalue.cpp +++ b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-align_value-on-lvalue.cpp @@ -26,8 +26,8 @@ int main(int argc, char* argv[]) { struct ac_struct x; x.a = ptr + 1; // FIXME: it is weird that this does not also have an assumption. load_from_ac_struct(&x); - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-9]]:13: runtime error: assumption of 32768 byte alignment for pointer of type 'aligned_char' (aka 'char *') failed - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-17]]:30: note: alignment assumption was specified here + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-9]]:13: runtime error: assumption of 32768 byte alignment for pointer of type 'aligned_char' (aka 'char *') failed + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-17]]:30: note: alignment assumption was specified here // CHECK: 0x{{.*}}: note: address is {{.*}} aligned, misalignment offset is {{.*}} byte free(ptr); diff --git a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-align_value-on-paramvar.cpp b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-align_value-on-paramvar.cpp similarity index 87% rename from compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-align_value-on-paramvar.cpp rename to compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-align_value-on-paramvar.cpp index 774ba90..d6090e9c 100644 --- a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-align_value-on-paramvar.cpp +++ b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-align_value-on-paramvar.cpp @@ -18,8 +18,8 @@ int main(int argc, char* argv[]) { char *ptr = (char *)malloc(2); passthrough(ptr + 1); - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-7]]:10: runtime error: assumption of 32768 byte alignment for pointer of type 'char *' failed - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-9]]:34: note: alignment assumption was specified here + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-7]]:10: runtime error: assumption of 32768 byte alignment for pointer of type 'char *' failed + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-9]]:34: note: alignment assumption was specified here // CHECK: 0x{{.*}}: note: address is {{.*}} aligned, misalignment offset is {{.*}} byte // FIXME: shouldn't there be an assumption on the caller's side too? diff --git a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-alloc_align-on-function-variable.cpp b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-alloc_align-on-function-variable.cpp similarity index 87% rename from compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-alloc_align-on-function-variable.cpp rename to compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-alloc_align-on-function-variable.cpp index c71cb1e..b8048bd 100644 --- a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-alloc_align-on-function-variable.cpp +++ b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-alloc_align-on-function-variable.cpp @@ -23,8 +23,8 @@ int main(int argc, char* argv[]) { alignment = 0x8000; passthrough(ptr + 1, alignment); - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-1]]:3: runtime error: assumption of 32768 byte alignment for pointer of type 'char *' failed - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-14]]:22: note: alignment assumption was specified here + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-1]]:3: runtime error: assumption of 32768 byte alignment for pointer of type 'char *' failed + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-14]]:22: note: alignment assumption was specified here // CHECK: 0x{{.*}}: note: address is {{.*}} aligned, misalignment offset is {{.*}} byte free(ptr); diff --git a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-alloc_align-on-function.cpp b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-alloc_align-on-function.cpp similarity index 87% rename from compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-alloc_align-on-function.cpp rename to compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-alloc_align-on-function.cpp index db22e3a..d0dbea5 100644 --- a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-alloc_align-on-function.cpp +++ b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-alloc_align-on-function.cpp @@ -19,8 +19,8 @@ int main(int argc, char* argv[]) { char *ptr = (char *)malloc(2); passthrough(ptr + 1, 0x8000); - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-1]]:3: runtime error: assumption of 32768 byte alignment for pointer of type 'char *' failed - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-10]]:22: note: alignment assumption was specified here + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-1]]:3: runtime error: assumption of 32768 byte alignment for pointer of type 'char *' failed + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-10]]:22: note: alignment assumption was specified here // CHECK: 0x{{.*}}: note: address is {{.*}} aligned, misalignment offset is {{.*}} byte free(ptr); diff --git a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-assume_aligned-on-function-two-params.cpp b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-assume_aligned-on-function-two-params.cpp similarity index 86% rename from compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-assume_aligned-on-function-two-params.cpp rename to compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-assume_aligned-on-function-two-params.cpp index 33aa132..90226c2 100644 --- a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-assume_aligned-on-function-two-params.cpp +++ b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-assume_aligned-on-function-two-params.cpp @@ -18,8 +18,8 @@ int main(int argc, char* argv[]) { char *ptr = (char *)malloc(3); passthrough(ptr + 2); - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-1]]:3: runtime error: assumption of 32768 byte alignment (with offset of 1 byte) for pointer of type 'char *' failed - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-9]]:22: note: alignment assumption was specified here + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-1]]:3: runtime error: assumption of 32768 byte alignment (with offset of 1 byte) for pointer of type 'char *' failed + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-9]]:22: note: alignment assumption was specified here // CHECK: 0x{{.*}}: note: offset address is {{.*}} aligned, misalignment offset is {{.*}} byte free(ptr); diff --git a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-assume_aligned-on-function.cpp b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-assume_aligned-on-function.cpp similarity index 87% rename from compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-assume_aligned-on-function.cpp rename to compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-assume_aligned-on-function.cpp index 202c0ce..72968ba 100644 --- a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-attribute-assume_aligned-on-function.cpp +++ b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-attribute-assume_aligned-on-function.cpp @@ -18,8 +18,8 @@ int main(int argc, char* argv[]) { char *ptr = (char *)malloc(2); passthrough(ptr + 1); - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-1]]:3: runtime error: assumption of 32768 byte alignment for pointer of type 'char *' failed - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-9]]:22: note: alignment assumption was specified here + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-1]]:3: runtime error: assumption of 32768 byte alignment for pointer of type 'char *' failed + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-9]]:22: note: alignment assumption was specified here // CHECK: 0x{{.*}}: note: address is {{.*}} aligned, misalignment offset is {{.*}} byte free(ptr); diff --git a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-builtin_assume_aligned-three-params-variable.cpp b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-builtin_assume_aligned-three-params-variable.cpp similarity index 91% rename from compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-builtin_assume_aligned-three-params-variable.cpp rename to compiler-rt/test/ubsan/TestCases/Pointer/align-assume-builtin_assume_aligned-three-params-variable.cpp index cc4e1f2..580af4c 100644 --- a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-builtin_assume_aligned-three-params-variable.cpp +++ b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-builtin_assume_aligned-three-params-variable.cpp @@ -18,7 +18,7 @@ int main(int argc, char* argv[]) { offset = 1; __builtin_assume_aligned(ptr + 2, 0x8000, offset); - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-1]]:32: runtime error: assumption of 32768 byte alignment (with offset of 1 byte) for pointer of type 'char *' failed + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-1]]:32: runtime error: assumption of 32768 byte alignment (with offset of 1 byte) for pointer of type 'char *' failed // CHECK: 0x{{.*}}: note: offset address is {{.*}} aligned, misalignment offset is {{.*}} byte free(ptr); diff --git a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-builtin_assume_aligned-three-params.cpp b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-builtin_assume_aligned-three-params.cpp similarity index 90% rename from compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-builtin_assume_aligned-three-params.cpp rename to compiler-rt/test/ubsan/TestCases/Pointer/align-assume-builtin_assume_aligned-three-params.cpp index 724abd5..eeca8d7 100644 --- a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-builtin_assume_aligned-three-params.cpp +++ b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-builtin_assume_aligned-three-params.cpp @@ -14,7 +14,7 @@ int main(int argc, char* argv[]) { char *ptr = (char *)malloc(3); __builtin_assume_aligned(ptr + 2, 0x8000, 1); - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-1]]:32: runtime error: assumption of 32768 byte alignment (with offset of 1 byte) for pointer of type 'char *' failed + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-1]]:32: runtime error: assumption of 32768 byte alignment (with offset of 1 byte) for pointer of type 'char *' failed // CHECK: 0x{{.*}}: note: offset address is {{.*}} aligned, misalignment offset is {{.*}} byte free(ptr); diff --git a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-builtin_assume_aligned-two-params.cpp b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-builtin_assume_aligned-two-params.cpp similarity index 91% rename from compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-builtin_assume_aligned-two-params.cpp rename to compiler-rt/test/ubsan/TestCases/Pointer/align-assume-builtin_assume_aligned-two-params.cpp index 2737f3d..6b5a48d 100644 --- a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-builtin_assume_aligned-two-params.cpp +++ b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-builtin_assume_aligned-two-params.cpp @@ -14,7 +14,7 @@ int main(int argc, char* argv[]) { char *ptr = (char *)malloc(2); __builtin_assume_aligned(ptr + 1, 0x8000); - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-1]]:32: runtime error: assumption of 32768 byte alignment for pointer of type 'char *' failed + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-1]]:32: runtime error: assumption of 32768 byte alignment for pointer of type 'char *' failed // CHECK: 0x{{.*}}: note: address is {{.*}} aligned, misalignment offset is {{.*}} byte free(ptr); diff --git a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-ignorelist.cpp b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-ignorelist.cpp similarity index 80% rename from compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-ignorelist.cpp rename to compiler-rt/test/ubsan/TestCases/Pointer/align-assume-ignorelist.cpp index e5c1664..6c55aa1 100644 --- a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-ignorelist.cpp +++ b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-ignorelist.cpp @@ -11,7 +11,7 @@ int main(int argc, char* argv[]) { char *ptr = (char *)malloc(2); __builtin_assume_aligned(ptr + 1, 0x8000); - // CHECK: {{.*}}alignment-assumption-ignorelist.cpp:[[@LINE-1]]:32: runtime error: assumption of 32768 byte alignment for pointer of type 'char *' failed + // CHECK: {{.*}}align-assume-ignorelist.cpp:[[@LINE-1]]:32: runtime error: assumption of 32768 byte alignment for pointer of type 'char *' failed // CHECK: 0x{{.*}}: note: address is {{.*}} aligned, misalignment offset is {{.*}} byte free(ptr); diff --git a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-openmp.cpp b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-openmp.cpp similarity index 92% rename from compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-openmp.cpp rename to compiler-rt/test/ubsan/TestCases/Pointer/align-assume-openmp.cpp index 482316e..2a42d15 100644 --- a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-openmp.cpp +++ b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-openmp.cpp @@ -19,7 +19,7 @@ int main(int argc, char* argv[]) { #pragma omp for simd aligned(data : 0x8000) for(int x = 0; x < 1; x++) data[x] = data[x]; - // CHECK: {{.*}}alignment-assumption-{{.*}}.cpp:[[@LINE-3]]:30: runtime error: assumption of 32768 byte alignment for pointer of type 'char *' failed + // CHECK: {{.*}}align-assume-{{.*}}.cpp:[[@LINE-3]]:30: runtime error: assumption of 32768 byte alignment for pointer of type 'char *' failed // CHECK: 0x{{.*}}: note: address is {{.*}} aligned, misalignment offset is {{.*}} byte free(ptr); diff --git a/compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-summary.cpp b/compiler-rt/test/ubsan/TestCases/Pointer/align-assume-summary.cpp similarity index 100% rename from compiler-rt/test/ubsan/TestCases/Pointer/alignment-assumption-summary.cpp rename to compiler-rt/test/ubsan/TestCases/Pointer/align-assume-summary.cpp -- 2.7.4