Skip to content

Commit 4a40526

Browse files
authored
[SYCL][E2E] Quote paths used in SDK testing (#17718)
Need this for Windows where there are spaces in the path. --------- Signed-off-by: Sarnie, Nick <[email protected]>
1 parent e1c0bc1 commit 4a40526

File tree

1 file changed

+28
-13
lines changed

1 file changed

+28
-13
lines changed

sycl/test-e2e/lit.cfg.py

+28-13
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import re
77
import subprocess
88
import textwrap
9+
import shlex
910
import shutil
1011

1112
import lit.formats
@@ -304,12 +305,18 @@ def open_check_file(file_name):
304305
file=fp,
305306
)
306307

307-
config.level_zero_libs_dir = lit_config.params.get(
308-
"level_zero_libs_dir", config.level_zero_libs_dir
308+
config.level_zero_libs_dir = shlex.quote(
309+
lit_config.params.get("level_zero_libs_dir", config.level_zero_libs_dir)
309310
)
310-
config.level_zero_include = lit_config.params.get(
311-
"level_zero_include",
312-
(config.level_zero_include if config.level_zero_include else config.sycl_include),
311+
config.level_zero_include = shlex.quote(
312+
lit_config.params.get(
313+
"level_zero_include",
314+
(
315+
config.level_zero_include
316+
if config.level_zero_include
317+
else config.sycl_include
318+
),
319+
)
313320
)
314321

315322
level_zero_options = level_zero_options = (
@@ -409,10 +416,14 @@ def open_check_file(file_name):
409416
file=fp,
410417
)
411418

412-
config.cuda_libs_dir = lit_config.params.get("cuda_libs_dir", config.cuda_libs_dir)
413-
config.cuda_include = lit_config.params.get(
414-
"cuda_include",
415-
(config.cuda_include if config.cuda_include else config.sycl_include),
419+
config.cuda_libs_dir = shlex.quote(
420+
lit_config.params.get("cuda_libs_dir", config.cuda_libs_dir)
421+
)
422+
config.cuda_include = shlex.quote(
423+
lit_config.params.get(
424+
"cuda_include",
425+
(config.cuda_include if config.cuda_include else config.sycl_include),
426+
)
416427
)
417428

418429
cuda_options = cuda_options = (
@@ -454,10 +465,14 @@ def open_check_file(file_name):
454465
),
455466
file=fp,
456467
)
457-
config.hip_libs_dir = lit_config.params.get("hip_libs_dir", config.hip_libs_dir)
458-
config.hip_include = lit_config.params.get(
459-
"hip_include",
460-
(config.hip_include if config.hip_include else config.sycl_include),
468+
config.hip_libs_dir = shlex.quote(
469+
lit_config.params.get("hip_libs_dir", config.hip_libs_dir)
470+
)
471+
config.hip_include = shlex.quote(
472+
lit_config.params.get(
473+
"hip_include",
474+
(config.hip_include if config.hip_include else config.sycl_include),
475+
)
461476
)
462477

463478
hip_options = hip_options = (

0 commit comments

Comments
 (0)