Skip to content

Commit 858539a

Browse files
[SYCL][E2E] Use %{run-aux} when removing %t/cache_dir (#18014)
Logically, it affects subsequent `%{run}` lines so must be done in run-mode, not in build-mode.
1 parent db8fda2 commit 858539a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

sycl/test-e2e/KernelAndProgram/cache_env_vars.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// No JITing for host devices.
22
// REQUIRES: opencl || level_zero
3-
// RUN: rm -rf %t/cache_dir
3+
// RUN: %{run-aux} rm -rf %t/cache_dir
44
// RUN: %{build} -o %t.out -DTARGET_IMAGE=INC100
55
// Build program and add item to cache
66
// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD

sycl/test-e2e/KernelAndProgram/cache_env_vars_lin.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// windows.
33
// REQUIRES: (level_zero || opencl) && linux
44

5-
// RUN: rm -rf %t/cache_dir
5+
// RUN: %{run-aux} rm -rf %t/cache_dir
66
// RUN: %{build} -o %t.out -DTARGET_IMAGE=INC100
77

88
// When no environment variables pointing cache directory are set the cache is
@@ -12,13 +12,13 @@
1212

1313
// When any of environment variables pointing to cache root is present cache is
1414
// enabled
15-
// RUN: rm -rf %t/cache_dir
15+
// RUN: %{run-aux} rm -rf %t/cache_dir
1616
// RUN: env SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_UR_TRACE=2 env -u SYCL_CACHE_DIR env -u HOME %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
1717
// RUN: env SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_UR_TRACE=2 env -u SYCL_CACHE_DIR env -u HOME %{run} %t.out | FileCheck %s --check-prefixes=CHECK-CACHE
18-
// RUN: rm -rf %t/cache_dir
18+
// RUN: %{run-aux} rm -rf %t/cache_dir
1919
// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 env -u XDG_CACHE_HOME env -u HOME %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
2020
// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 env -u XDG_CACHE_HOME env -u HOME %{run} %t.out | FileCheck %s --check-prefixes=CHECK-CACHE
21-
// RUN: rm -rf %t/cache_dir
21+
// RUN: %{run-aux} rm -rf %t/cache_dir
2222
// RUN: env SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_UR_TRACE=2 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
2323
// RUN: env SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_UR_TRACE=2 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %{run} %t.out | FileCheck %s --check-prefixes=CHECK-CACHE
2424

0 commit comments

Comments
 (0)