From fa944d296c2c0d5946b0d9159f86327e2a8e507b Mon Sep 17 00:00:00 2001 From: Dominik Dabek Date: Mon, 17 May 2021 11:23:54 +0000 Subject: [PATCH] Correct test excludes Related-To: NEO-5807 Signed-off-by: Dominik Dabek Co-authored-by: Mateusz Jablonski --- opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp | 4 ++-- opencl/test/unit_test/gen12lp/adls/excludes_adls.cpp | 4 +++- opencl/test/unit_test/gen12lp/rkl/excludes_rkl.cpp | 4 +++- opencl/test/unit_test/os_interface/device_factory_tests.cpp | 2 +- shared/test/common/gen12lp/adls/test_hw_info_config_adls.cpp | 2 -- shared/test/common/gen12lp/rkl/test_hw_info_config_rkl.cpp | 2 -- 6 files changed, 9 insertions(+), 9 deletions(-) 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 d0c3621c29..e57eb230a6 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -63,4 +63,4 @@ EHLTEST_F(EhlHwInfo, givenBoolWhenCallEhlHardwareInfoSetupThenFeatureTableAndWor } } -HWCMDTEST_EXCLUDE_FAMILY(DeviceFactoryTest, givenValidHwConfigStringPrepareDeviceEnvironmentsForProductFamilyOverrideReturnsTrue, IGFX_ELKHARTLAKE); \ No newline at end of file +HWCMDTEST_EXCLUDE_FAMILY(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ELKHARTLAKE); \ No newline at end of file diff --git a/opencl/test/unit_test/gen12lp/adls/excludes_adls.cpp b/opencl/test/unit_test/gen12lp/adls/excludes_adls.cpp index 12b37acf43..e559e60ffa 100644 --- a/opencl/test/unit_test/gen12lp/adls/excludes_adls.cpp +++ b/opencl/test/unit_test/gen12lp/adls/excludes_adls.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -23,6 +23,8 @@ HWCMDTEST_EXCLUDE_FAMILY(ProfilingWithPerfCountersTests, GivenCommandQueueWithPr HWCMDTEST_EXCLUDE_FAMILY(TimestampEventCreate, givenEventTimestampsWhenQueryKernelTimestampThenCorrectDataAreSet, IGFX_ALDERLAKE_S); } // namespace NEO +HWCMDTEST_EXCLUDE_FAMILY(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ALDERLAKE_S); + HWCMDTEST_EXCLUDE_FAMILY(ProfilingCommandsTest, givenKernelWhenProfilingCommandStartIsTakenThenTimeStampAddressIsProgrammedCorrectly, IGFX_ALDERLAKE_S); HWCMDTEST_EXCLUDE_FAMILY(ProfilingCommandsTest, givenKernelWhenProfilingCommandStartIsNotTakenThenTimeStampAddressIsProgrammedCorrectly, IGFX_ALDERLAKE_S); diff --git a/opencl/test/unit_test/gen12lp/rkl/excludes_rkl.cpp b/opencl/test/unit_test/gen12lp/rkl/excludes_rkl.cpp index d51ef5de1a..27922fb64e 100644 --- a/opencl/test/unit_test/gen12lp/rkl/excludes_rkl.cpp +++ b/opencl/test/unit_test/gen12lp/rkl/excludes_rkl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -23,6 +23,8 @@ HWCMDTEST_EXCLUDE_FAMILY(ProfilingWithPerfCountersTests, GivenCommandQueueWithPr HWCMDTEST_EXCLUDE_FAMILY(TimestampEventCreate, givenEventTimestampsWhenQueryKernelTimestampThenCorrectDataAreSet, IGFX_ROCKETLAKE); } // namespace NEO +HWCMDTEST_EXCLUDE_FAMILY(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ROCKETLAKE); + HWCMDTEST_EXCLUDE_FAMILY(ProfilingCommandsTest, givenKernelWhenProfilingCommandStartIsTakenThenTimeStampAddressIsProgrammedCorrectly, IGFX_ROCKETLAKE); HWCMDTEST_EXCLUDE_FAMILY(ProfilingCommandsTest, givenKernelWhenProfilingCommandStartIsNotTakenThenTimeStampAddressIsProgrammedCorrectly, IGFX_ROCKETLAKE); 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 da7aa2e903..bb0db67992 100644 --- a/opencl/test/unit_test/os_interface/device_factory_tests.cpp +++ b/opencl/test/unit_test/os_interface/device_factory_tests.cpp @@ -286,7 +286,7 @@ TEST_F(DeviceFactoryTest, givenInvalidHwConfigStringWhenPreparingDeviceEnvironme EXPECT_FALSE(success); } -HWTEST_F(DeviceFactoryTest, givenValidHwConfigStringPrepareDeviceEnvironmentsForProductFamilyOverrideReturnsTrue) { +HWTEST_F(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException) { DebugManagerStateRestore stateRestore; DebugManager.flags.HardwareInfoOverride.set("1x1x1"); diff --git a/shared/test/common/gen12lp/adls/test_hw_info_config_adls.cpp b/shared/test/common/gen12lp/adls/test_hw_info_config_adls.cpp index 5863000e47..64804c9202 100644 --- a/shared/test/common/gen12lp/adls/test_hw_info_config_adls.cpp +++ b/shared/test/common/gen12lp/adls/test_hw_info_config_adls.cpp @@ -66,5 +66,3 @@ ADLSTEST_F(AdlsHwInfo, givenAdlsWhenCheckL0ThenReturnTrue) { const HardwareInfo &hardwareInfo = ADLS::hwInfo; EXPECT_TRUE(hardwareInfo.capabilityTable.levelZeroSupported); } - -HWCMDTEST_EXCLUDE_FAMILY(DeviceFactoryTest, givenValidHwConfigStringPrepareDeviceEnvironmentsForProductFamilyOverrideReturnsTrue, IGFX_ALDERLAKE_S); diff --git a/shared/test/common/gen12lp/rkl/test_hw_info_config_rkl.cpp b/shared/test/common/gen12lp/rkl/test_hw_info_config_rkl.cpp index c379526e30..d16265306f 100644 --- a/shared/test/common/gen12lp/rkl/test_hw_info_config_rkl.cpp +++ b/shared/test/common/gen12lp/rkl/test_hw_info_config_rkl.cpp @@ -76,5 +76,3 @@ RKLTEST_F(RklHwInfo, givenRklWhenCheckL0ThenReturnTrue) { const HardwareInfo &hardwareInfo = RKL::hwInfo; EXPECT_TRUE(hardwareInfo.capabilityTable.levelZeroSupported); } - -HWCMDTEST_EXCLUDE_FAMILY(DeviceFactoryTest, givenValidHwConfigStringPrepareDeviceEnvironmentsForProductFamilyOverrideReturnsTrue, IGFX_ROCKETLAKE); \ No newline at end of file