From aa20b57a3550edf9082ec5cd0b142f2764ca49ee Mon Sep 17 00:00:00 2001 From: "Perkins, Chris" Date: Wed, 24 Sep 2025 15:18:27 -0700 Subject: [PATCH 1/2] Windows CI sometimes builds on one machine and runs on another, and the paths might differ. Fixing test to account for this. --- sycl/test-e2e/IntermediateLib/multi_lib_app.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sycl/test-e2e/IntermediateLib/multi_lib_app.cpp b/sycl/test-e2e/IntermediateLib/multi_lib_app.cpp index 3d1d1cb41a1e8..893db9f37bd95 100644 --- a/sycl/test-e2e/IntermediateLib/multi_lib_app.cpp +++ b/sycl/test-e2e/IntermediateLib/multi_lib_app.cpp @@ -1,8 +1,7 @@ // UNSUPPORTED: cuda || hip // UNSUPPORTED-TRACKER: CMPLRLLVM-69415 -// UNSUPPORTED: windows -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20023 + // DEFINE: %{fPIC_flag} = %if windows %{%} %else %{-fPIC%} // DEFINE: %{shared_lib_ext} = %if windows %{dll%} %else %{so%} @@ -17,12 +16,17 @@ // So the hack here is to put heredoc in the definition // and use single quotes, which Python forgivingly accepts. // clang-format on + +// On Windows, the CI sometimes builds on one machine and runs on another. +// This means that %T might not be consistent between build and run. +// So we use %{run-aux} to perform ALL actions on the run machine +// like we do for the AoT tests. -// RUN: %{build} %{fPIC_flag} -DSO_PATH='R"(%T)"' -o %t.out +// RUN: %{run-aux} %clangxx -fsycl %{fPIC_flag} -DSO_PATH='R"(%T)"' -o %t.out %s -// RUN: %clangxx -fsycl %{fPIC_flag} -shared -DINC=1 -o %T/lib_a.%{shared_lib_ext} %S/Inputs/incrementing_lib.cpp -// RUN: %clangxx -fsycl %{fPIC_flag} -shared -DINC=2 -o %T/lib_b.%{shared_lib_ext} %S/Inputs/incrementing_lib.cpp -// RUN: %clangxx -fsycl %{fPIC_flag} -shared -DINC=4 -o %T/lib_c.%{shared_lib_ext} %S/Inputs/incrementing_lib.cpp +// RUN: %{run-aux} %clangxx -fsycl %{fPIC_flag} -shared -DINC=1 -o %T/lib_a.%{shared_lib_ext} %S/Inputs/incrementing_lib.cpp +// RUN: %{run-aux} %clangxx -fsycl %{fPIC_flag} -shared -DINC=2 -o %T/lib_b.%{shared_lib_ext} %S/Inputs/incrementing_lib.cpp +// RUN: %{run-aux} %clangxx -fsycl %{fPIC_flag} -shared -DINC=4 -o %T/lib_c.%{shared_lib_ext} %S/Inputs/incrementing_lib.cpp // RUN: env UR_L0_LEAKS_DEBUG=1 %{run} %t.out From 59b1afd6c31193a5457afd162b5b35c0bcf60fa3 Mon Sep 17 00:00:00 2001 From: "Perkins, Chris" Date: Wed, 24 Sep 2025 15:20:44 -0700 Subject: [PATCH 2/2] anticipate clang-format requirements --- sycl/test-e2e/IntermediateLib/multi_lib_app.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/sycl/test-e2e/IntermediateLib/multi_lib_app.cpp b/sycl/test-e2e/IntermediateLib/multi_lib_app.cpp index 893db9f37bd95..69c4c50662e95 100644 --- a/sycl/test-e2e/IntermediateLib/multi_lib_app.cpp +++ b/sycl/test-e2e/IntermediateLib/multi_lib_app.cpp @@ -1,8 +1,6 @@ // UNSUPPORTED: cuda || hip // UNSUPPORTED-TRACKER: CMPLRLLVM-69415 - - // DEFINE: %{fPIC_flag} = %if windows %{%} %else %{-fPIC%} // DEFINE: %{shared_lib_ext} = %if windows %{dll%} %else %{so%}