From 18b43eeb6a1e840f5bb0db885e1dbc0726e7fdee Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Mon, 13 Nov 2023 15:50:24 +0000 Subject: [PATCH] test: prepare tests to run with clang on Windows in release config Signed-off-by: Mateusz Jablonski --- manifests/manifest.yml | 2 +- opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp | 1 + .../command_queue/get_size_required_image_tests.cpp | 1 + .../unit_test/offline_compiler/segfault_test/CMakeLists.txt | 2 +- .../test/unit_test/offline_compiler/segfault_test/main.cpp | 6 ++++-- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/manifests/manifest.yml b/manifests/manifest.yml index 98b3a559c2..0dc3b4eeee 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -31,7 +31,7 @@ components: branch: master dest_dir: infra fetch_tags: true - revision: v5514 + revision: v5515 type: git internal: branch: master diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp index 779d4296c8..91380bf3d5 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp @@ -23,6 +23,7 @@ #include "shared/test/common/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" +#include "opencl/source/program/create.inl" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" diff --git a/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp index 76850b4135..16b4355c98 100644 --- a/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp @@ -19,6 +19,7 @@ #include "opencl/source/event/event.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/source/program/create.inl" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h" diff --git a/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt b/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt index 50dc99ab0e..d801f535b7 100644 --- a/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt +++ b/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt @@ -53,7 +53,7 @@ set(CLOC_SEGFAULT_TEST_INCLUDES ${NEO_SOURCE_DIR} ) -if(CMAKE_COMPILER_IS_GNUCC) +if(CMAKE_COMPILER_IS_GNUCC OR(WIN32 AND NOT MSVC AND ${CMAKE_BUILD_TYPE} STREQUAL "Release")) target_compile_definitions(ocloc_segfault_test PRIVATE SKIP_SEGFAULT_TEST=1) endif() diff --git a/opencl/test/unit_test/offline_compiler/segfault_test/main.cpp b/opencl/test/unit_test/offline_compiler/segfault_test/main.cpp index 53b9884b45..7b6b0e0907 100644 --- a/opencl/test/unit_test/offline_compiler/segfault_test/main.cpp +++ b/opencl/test/unit_test/offline_compiler/segfault_test/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -40,7 +40,7 @@ void captureAndCheckStdOut() { EXPECT_TRUE(hasSubstr(callstack, std::string("Callstack"))); EXPECT_TRUE(hasSubstr(callstack, std::string("cloc_segfault_test"))); - EXPECT_TRUE(hasSubstr(callstack, std::string("generateSegfaultWithSafetyGuard"))); + EXPECT_TRUE(hasSubstr(callstack, std::string("generateSegfaultWithSafetyGuard"))) << callstack; } TEST(SegFault, givenCallWithSafetyGuardWhenSegfaultHappensThenCallstackIsPrintedToStdOut) { @@ -51,5 +51,7 @@ TEST(SegFault, givenCallWithSafetyGuardWhenSegfaultHappensThenCallstackIsPrinted auto retVal = generateSegfaultWithSafetyGuard(&segfault); EXPECT_EQ(-60, retVal); +#else + GTEST_SKIP(); #endif }