Skip to content

Commit 5e0ca1a

Browse files
aelovikov-intelaelovikov-intel
authored
[SYCL][Test E2E] Use %{build}/%{run} in miscellaneous tests (#9347)
1 parent 868a812 commit 5e0ca1a

File tree

82 files changed

+170
-270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+170
-270
lines changed

‎sycl/test-e2e/Assert/assert_in_kernels.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// https://github.com/intel/llvm/issues/7634
44
// UNSUPPORTED: hip
55

6-
// RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
6+
// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
77
// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.cpu.txt || true
88
// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.cpu.txt
99
// RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.gpu.txt || true

‎sycl/test-e2e/Assert/assert_in_kernels_ndebug.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -DNDEBUG %S/assert_in_kernels.cpp -o %t.out
2-
// RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
3-
// RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
4-
// RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
2+
// RUN: %{run} %t.out | FileCheck %s
53
//
64
// CHECK-NOT: One shouldn't see this message
75
// CHECK-NOT: from assert statement

‎sycl/test-e2e/Assert/assert_in_kernels_win.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: windows
2-
// RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2+
// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
33
// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
44
// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
55
// RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true

‎sycl/test-e2e/Assert/assert_in_multiple_tus.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// https://github.com/intel/llvm/issues/7634
44
// UNSUPPORTED: hip
55

6-
// RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple -I %S/Inputs %s %S/Inputs/kernels_in_file2.cpp -o %t.out
6+
// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out
77
// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.cpu.txt || true
88
// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.cpu.txt
99
// RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.gpu.txt || true

‎sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: windows
2-
// RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple -I %S/Inputs %s %S/Inputs/kernels_in_file2.cpp -o %t.out
2+
// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out
33
// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
44
// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
55
// RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true

‎sycl/test-e2e/Assert/assert_in_one_kernel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// https://github.com/intel/llvm/issues/7634
44
// UNSUPPORTED: hip
55

6-
// RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
6+
// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
77
// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.cpu.txt || true
88
// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.cpu.txt
99
// RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.gpu.txt || true

‎sycl/test-e2e/Assert/assert_in_one_kernel_ndebug.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -DNDEBUG %S/assert_in_one_kernel.cpp -o %t.out
2-
// RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
3-
// RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
4-
// RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
2+
// RUN: %{run} %t.out | FileCheck %s
53
//
64
// CHECK-NOT: from assert statement
75
// CHECK: The test ended.

‎sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: windows
2-
// RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2+
// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
33
// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
44
// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
55
// RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true

‎sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: linux
22
// FIXME: Flaky on HIP and cuda
33
// UNSUPPORTED: hip || cuda
4-
// RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %threads_lib
4+
// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out %threads_lib
55
// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
66
// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
77
//

‎sycl/test-e2e/Assert/assert_in_simultaneous_kernels_win.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: windows
2-
// RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %threads_lib
2+
// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out %threads_lib
33
// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
44
// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
55
//

0 commit comments

Comments
 (0)