diff --git a/opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp b/opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp index 07b43f5c67..d0c3621c29 100644 --- a/opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp +++ b/opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp @@ -14,7 +14,7 @@ using EhlHwInfo = ::testing::Test; EHLTEST_F(EhlHwInfo, givenHwInfoConfigStringThenAfterSetupResultingVmeIsDisabled) { HardwareInfo hwInfo; - hardwareInfoSetup[productFamily](&hwInfo, false, 0x0); + hardwareInfoSetup[productFamily](&hwInfo, false, 0x100040008); EXPECT_FALSE(hwInfo.capabilityTable.ftrSupportsVmeAvcTextureSampler); EXPECT_FALSE(hwInfo.capabilityTable.ftrSupportsVmeAvcPreemption); EXPECT_FALSE(hwInfo.capabilityTable.supportsVme); @@ -33,7 +33,7 @@ EHLTEST_F(EhlHwInfo, givenBoolWhenCallEhlHardwareInfoSetupThenFeatureTableAndWor gtSystemInfo = {0}; featureTable = {}; workaroundTable = {}; - hardwareInfoSetup[productFamily](&hwInfo, setParamBool, 0x0); + hardwareInfoSetup[productFamily](&hwInfo, setParamBool, 0x100040008); EXPECT_EQ(setParamBool, featureTable.ftrL3IACoherency); EXPECT_EQ(setParamBool, featureTable.ftrPPGTT); @@ -62,3 +62,5 @@ EHLTEST_F(EhlHwInfo, givenBoolWhenCallEhlHardwareInfoSetupThenFeatureTableAndWor EXPECT_EQ(setParamBool, workaroundTable.waReportPerfCountUseGlobalContextID); } } + +HWCMDTEST_EXCLUDE_FAMILY(DeviceFactoryTest, givenValidHwConfigStringPrepareDeviceEnvironmentsForProductFamilyOverrideReturnsTrue, IGFX_ELKHARTLAKE); \ No newline at end of file diff --git a/opencl/test/unit_test/os_interface/device_factory_tests.cpp b/opencl/test/unit_test/os_interface/device_factory_tests.cpp index 5c7d838d59..4fdc46c971 100644 --- a/opencl/test/unit_test/os_interface/device_factory_tests.cpp +++ b/opencl/test/unit_test/os_interface/device_factory_tests.cpp @@ -16,8 +16,8 @@ #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_platform.h" +#include "test.h" -#include "gtest/gtest.h" #include "hw_device_id.h" #include @@ -201,7 +201,7 @@ TEST_F(DeviceFactoryTest, givenInvalidHwConfigStringPrepareDeviceEnvironmentsFor EXPECT_FALSE(success); } -TEST_F(DeviceFactoryTest, givenValidHwConfigStringPrepareDeviceEnvironmentsForProductFamilyOverrideReturnsTrue) { +HWTEST_F(DeviceFactoryTest, givenValidHwConfigStringPrepareDeviceEnvironmentsForProductFamilyOverrideReturnsTrue) { DebugManagerStateRestore stateRestore; DebugManager.flags.HardwareInfoOverride.set("1x1x1");