From 4679dc0247846bd5ae0f89cc66c5a7fa6d92308f Mon Sep 17 00:00:00 2001 From: aelovikov-intel Date: Fri, 6 Dec 2024 10:52:38 -0800 Subject: [PATCH] [CI] Run Nightly E2E CI in pre-C++11 ABI mode (#16235) We expect that our runtime library should work with user code compiled either way, but we don't be running double amount of testing in pre-commit/post-commit CI to verify that. Nightly looks like a reasonable choice to test this. --- .github/workflows/sycl-nightly.yml | 2 +- sycl/test-e2e/lit.site.cfg.py.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sycl-nightly.yml b/.github/workflows/sycl-nightly.yml index 2d21062c0b813..fa648b0395189 100644 --- a/.github/workflows/sycl-nightly.yml +++ b/.github/workflows/sycl-nightly.yml @@ -110,7 +110,7 @@ jobs: image_options: ${{ matrix.image_options }} target_devices: ${{ matrix.target_devices }} tests_selector: ${{ matrix.tests_selector }} - extra_lit_opts: ${{ matrix.extra_lit_opts }} + extra_lit_opts: "--param 'cxx_flags=-D_GLIBCXX_USE_CXX11_ABI=0' ${{ matrix.extra_lit_opts }}" reset_intel_gpu: ${{ matrix.reset_intel_gpu }} ref: ${{ github.sha }} merge_ref: '' diff --git a/sycl/test-e2e/lit.site.cfg.py.in b/sycl/test-e2e/lit.site.cfg.py.in index dfa5003c1a2f4..a6b86cb73d505 100644 --- a/sycl/test-e2e/lit.site.cfg.py.in +++ b/sycl/test-e2e/lit.site.cfg.py.in @@ -34,7 +34,7 @@ config.hip_platform = "@HIP_PLATFORM@" config.amd_arch = lit_config.params.get("amd_arch", "@AMD_ARCH@") config.sycl_threads_lib = '@SYCL_THREADS_LIB@' config.extra_environment = lit_config.params.get("extra_environment", "@LIT_EXTRA_ENVIRONMENT@") -config.cxx_flags = "@SYCL_E2E_CLANG_CXX_FLAGS@" +config.cxx_flags = lit_config.params.get("cxx_flags", "@SYCL_E2E_CLANG_CXX_FLAGS@") config.c_flags = "@CMAKE_C_FLAGS@" config.external_tests = "@SYCL_EXTERNAL_TESTS@" config.extra_include = "@CMAKE_CURRENT_SOURCE_DIR@/include"