Skip to content

Commit 74e5bc4

Browse files
authored
[SYCL][E2E] Fix checks for assertion tests on Windows (#13215)
"(" and ")" must be escaped.
1 parent 3bc93fb commit 74e5bc4

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

sycl/test-e2e/Assert/assert_in_kernels_win.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
// CHECK-NOT: One shouldn't see this message
99
// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
1010
// while for some insane reason.
11-
// CHECK: {{.*}}assert_in_kernels.hpp:27: {{<unknown func>|(null)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
11+
// CHECK: {{.*}}assert_in_kernels.hpp:27: {{<unknown func>|\(null\)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
1212
// CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed.
1313
// CHECK-NOT: test aborts earlier, one shouldn't see this message
1414
// CHECK-NOT: The test ended.
1515
//
16-
// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:27: {{<unknown func>|(null)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
16+
// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:27: {{<unknown func>|\(null\)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
1717
// CHECK-ACC: The test ended.
1818

1919
#include "assert_in_kernels.hpp"

sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug_win.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
// CHECK-NOT: this message from calculus
99
// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
1010
// while for some insane reason.
11-
// CHECK: {{.*}}assert_in_multiple_tus.hpp:22: {{<unknown func>|(null)}}: {{.*}} [5,0,0],
11+
// CHECK: {{.*}}assert_in_multiple_tus.hpp:22: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0],
1212
// CHECK-SAME: {{.*}} [1,0,0] Assertion `X && "Nil in result"` failed.
1313
// CHECK-NOT: this message from file2
1414
// CHECK-NOT: The test ended.
1515
//
16-
// CHECK-ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:22: {{<unknown func>|(null)}}: {{.*}} [5,0,0],
16+
// CHECK-ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:22: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0],
1717
// CHECK-ACC: The test ended.

sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
//
88
// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
99
// while for some insane reason.
10-
// CHECK: {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|(null)}}: {{.*}} [5,0,0], {{.*}} [1,0,0]
10+
// CHECK: {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0], {{.*}} [1,0,0]
1111
// CHECK-SAME: Assertion `X && "this message from calculus"` failed.
1212
// CHECK-NOT: this message from file2
1313
// CHECK-NOT: The test ended.
1414
//
15-
// CHECK-ACC-NOT: {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|(null)}}: {{.*}} [5,0,0], {{.*}} [1,0,0]
15+
// CHECK-ACC-NOT: {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0], {{.*}} [1,0,0]
1616
// CHECK-ACC: The test ended.
1717

1818
#include "assert_in_multiple_tus.hpp"

sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
//
88
// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
99
// while for some insane reason.
10-
// CHECK: {{.*}}assert_in_one_kernel.hpp:12: {{<unknown func>|(null)}}: {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
10+
// CHECK: {{.*}}assert_in_one_kernel.hpp:12: {{<unknown func>|\(null\)}}: {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
1111
// CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed.
1212
// CHECK-NOT: The test ended.
1313
//
14-
// CHECK-ACC-NOT: {{.*}}assert_in_one_kernel.hpp:12: {{<unknown func>|(null)}}: {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
14+
// CHECK-ACC-NOT: {{.*}}assert_in_one_kernel.hpp:12: {{<unknown func>|\(null\)}}: {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
1515
// CHECK-ACC: The test ended.
1616

1717
#include "assert_in_one_kernel.hpp"

sycl/test-e2e/Assert/assert_in_simultaneous_kernels_win.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
//
1717
// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
1818
// while for some insane reason.
19-
// CHECK: {{.*}}assert_in_simultaneous_kernels.hpp:16: {{<unknown func>|(null)}}: global id: [9,7,0], local id: [0,0,0]
19+
// CHECK: {{.*}}assert_in_simultaneous_kernels.hpp:16: {{<unknown func>|\(null\)}}: global id: [9,7,0], local id: [0,0,0]
2020
// CHECK-SAME: Assertion `false && "from assert statement"` failed.
2121
// CHECK-NOT: The test ended.
2222
//
23-
// CHECK-ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:16: {{<unknown func>|(null)}}: global id: [9,7,0], local id: [0,0,0]
23+
// CHECK-ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:16: {{<unknown func>|\(null\)}}: global id: [9,7,0], local id: [0,0,0]
2424
// CHECK-ACC: The test ended.
2525

2626
#include "assert_in_simultaneous_kernels.hpp"

0 commit comments

Comments
 (0)