Skip to content

Commit 7a46519

Browse files
committed
[asan][windows] Yet more relaxation of tests
1 parent a9bca66 commit 7a46519

9 files changed

+14
-14
lines changed

compiler-rt/test/asan/TestCases/Windows/double_free.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ int main() {
99
free(x);
1010
// CHECK: AddressSanitizer: attempting double-free on [[ADDR:0x[0-9a-f]+]]
1111
// CHECK-NEXT: {{#0 .* free }}
12-
// CHECK: {{ #[1-2] .* main .*double_free.cpp}}:[[@LINE-3]]
12+
// CHECK: {{ #[1-3] .* main .*double_free.cpp}}:[[@LINE-3]]
1313
// CHECK: [[ADDR]] is located 0 bytes inside of 168-byte region
1414
// CHECK-LABEL: freed by thread T0 here:
1515
// CHECK-NEXT: {{#0 .* free }}
16-
// CHECK: {{ #[1-2] .* main .*double_free.cpp}}:[[@LINE-8]]
16+
// CHECK: {{ #[1-3] .* main .*double_free.cpp}}:[[@LINE-8]]
1717
// CHECK-LABEL: previously allocated by thread T0 here:
1818
// CHECK-NEXT: {{#0 .* malloc }}
19-
// CHECK: {{ #[1-2] .* main .*double_free.cpp}}:[[@LINE-12]]
19+
// CHECK: {{ #[1-3] .* main .*double_free.cpp}}:[[@LINE-12]]
2020
return 0;
2121
}

compiler-rt/test/asan/TestCases/Windows/malloc_left_oob.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ int main() {
1212
// CHECK: [[ADDR]] is located 1 bytes before 42-byte region
1313
// CHECK: allocated by thread T0 here:
1414
// CHECK-NEXT: {{#0 .* malloc }}
15-
// CHECK: {{ #[1-2] .* main .*malloc_left_oob.cpp}}:[[@LINE-8]]
15+
// CHECK: {{ #[1-3] .* main .*malloc_left_oob.cpp}}:[[@LINE-8]]
1616
free(buffer);
1717
}

compiler-rt/test/asan/TestCases/Windows/malloc_right_oob.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ int main() {
1212
// CHECK: [[ADDR]] is located 0 bytes after 42-byte region
1313
// CHECK: allocated by thread T0 here:
1414
// CHECK-NEXT: {{#0 .* malloc }}
15-
// CHECK: {{ #[1-2] .* main .*malloc_right_oob.cpp}}:[[@LINE-8]]
15+
// CHECK: {{ #[1-3] .* main .*malloc_right_oob.cpp}}:[[@LINE-8]]
1616
free(buffer);
1717
}

compiler-rt/test/asan/TestCases/Windows/malloc_uaf.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ int main() {
1313
// CHECK: [[ADDR]] is located 0 bytes inside of 42-byte region
1414
// CHECK: freed by thread T0 here:
1515
// CHECK-NEXT: {{#0 .* free }}
16-
// CHECK: {{ #[1-2] .* main .*malloc_uaf.cpp}}:[[@LINE-8]]
16+
// CHECK: {{ #[1-3] .* main .*malloc_uaf.cpp}}:[[@LINE-8]]
1717
// CHECK: previously allocated by thread T0 here:
1818
// CHECK-NEXT: {{#0 .* malloc }}
19-
// CHECK: {{ #[1-2] .* main .*malloc_uaf.cpp}}:[[@LINE-12]]
19+
// CHECK: {{ #[1-3] .* main .*malloc_uaf.cpp}}:[[@LINE-12]]
2020
}

compiler-rt/test/asan/TestCases/Windows/realloc_left_oob.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ int main() {
1212
// CHECK: [[ADDR]] is located 1 bytes before 42-byte region
1313
// CHECK: allocated by thread T0 here:
1414
// CHECK-NEXT: {{#0 .* realloc }}
15-
// CHECK: {{ #[1-2] .* main .*realloc_left_oob.cpp}}:[[@LINE-8]]
15+
// CHECK: {{ #[1-3] .* main .*realloc_left_oob.cpp}}:[[@LINE-8]]
1616
free(buffer);
1717
}

compiler-rt/test/asan/TestCases/Windows/realloc_right_oob.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ int main() {
1212
// CHECK: [[ADDR]] is located 0 bytes after 42-byte region
1313
// CHECK: allocated by thread T0 here:
1414
// CHECK-NEXT: {{#0 .* realloc }}
15-
// CHECK: {{ #[1-2] .* main .*realloc_right_oob.cpp}}:[[@LINE-8]]
15+
// CHECK: {{ #[1-3] .* main .*realloc_right_oob.cpp}}:[[@LINE-8]]
1616
free(buffer);
1717
}

compiler-rt/test/asan/TestCases/Windows/realloc_uaf.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ int main() {
1313
// CHECK: [[ADDR]] is located 0 bytes inside of 42-byte region
1414
// CHECK: freed by thread T0 here:
1515
// CHECK-NEXT: {{#0 .* free }}
16-
// CHECK: {{ #[1-2] .* main .*realloc_uaf.cpp}}:[[@LINE-8]]
16+
// CHECK: {{ #[1-3] .* main .*realloc_uaf.cpp}}:[[@LINE-8]]
1717
// CHECK: previously allocated by thread T0 here:
1818
// CHECK-NEXT: {{#0 .* realloc }}
19-
// CHECK: {{ #[1-2] .* main .*realloc_uaf.cpp}}:[[@LINE-12]]
19+
// CHECK: {{ #[1-3] .* main .*realloc_uaf.cpp}}:[[@LINE-12]]
2020
}

compiler-rt/test/asan/TestCases/Windows/symbols_path.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ int main() {
1717
// CHECK: [[ADDR]] is located 1 bytes before 42-byte region
1818
// CHECK: allocated by thread T0 here:
1919
// CHECK-NEXT: {{#0 .* malloc}}
20-
// CHECK: {{ #[1-2] .* main .*symbols_path.cpp}}:[[@LINE-8]]
20+
// CHECK: {{ #[1-3] .* main .*symbols_path.cpp}}:[[@LINE-8]]
2121
free(buffer);
2222
}

compiler-rt/test/asan/TestCases/Windows/use_after_realloc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ int main() {
1515
// CHECK: [[ADDR]] is located 0 bytes inside of 32-byte region
1616
// CHECK: freed by thread T0 here:
1717
// CHECK-NEXT: {{#0 .* realloc }}
18-
// CHECK: {{ #[1-2] .* main .*use_after_realloc.cpp}}:[[@LINE-9]]
18+
// CHECK: {{ #[1-3] .* main .*use_after_realloc.cpp}}:[[@LINE-9]]
1919
// CHECK: previously allocated by thread T0 here:
2020
// CHECK-NEXT: {{#0 .* realloc }}
21-
// CHECK: {{ #[1-2] .* main .*use_after_realloc.cpp}}:[[@LINE-14]]
21+
// CHECK: {{ #[1-3] .* main .*use_after_realloc.cpp}}:[[@LINE-14]]
2222
free(buffer);
2323
}

0 commit comments

Comments
 (0)