From 42200bf7f327e32603f7bcf2316cb02d9dbe7b96 Mon Sep 17 00:00:00 2001 From: Jaime Arteaga Date: Tue, 19 May 2020 23:20:37 -0700 Subject: [PATCH] Correct tidy issues Change-Id: I3421f825c3f688491390d2c0305ff02b13fdcbec Signed-off: Jaime Arteaga --- .../core/test/unit_tests/sources/driver/test_driver.cpp | 8 +++++++- .../sources/sysman/engine/linux/mock_sysfs_engine.h | 3 ++- .../sources/sysman/frequency/linux/mock_sysfs_frequency.h | 3 ++- .../sources/sysman/scheduler/linux/mock_sysfs_scheduler.h | 3 ++- .../sources/sysman/standby/linux/mock_sysfs_standby.h | 3 ++- .../sysman/sysman_device/linux/mock_sysfs_sysman_device.h | 3 ++- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp b/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp index 345b8edef3..2d0a282874 100644 --- a/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp +++ b/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp @@ -163,6 +163,7 @@ TEST_F(DriverTestMultipleDeviceWithAffinityMask, whenNotSettingAffinityThenAllRo L0::DriverHandleImp *driverHandle = new DriverHandleImp; ze_result_t res = driverHandle->initialize(std::move(devices)); + EXPECT_EQ(ZE_RESULT_SUCCESS, res); uint32_t deviceCount = 0; res = zeDeviceGet(driverHandle->toHandle(), &deviceCount, nullptr); EXPECT_EQ(ZE_RESULT_SUCCESS, res); @@ -199,11 +200,16 @@ TEST_P(DriverTestMultipleDeviceWithAffinityMask, whenSettingAffinityMaskToDiffer driverHandle->affinityMask = device0Mask | (device1Mask << numSubDevices); + uint32_t totalRootDevices = rootDevice0Exposed + rootDevice1Exposed; ze_result_t res = driverHandle->initialize(std::move(devices)); + if (0 == totalRootDevices) { + EXPECT_EQ(ZE_RESULT_ERROR_UNINITIALIZED, res); + } else { + EXPECT_EQ(ZE_RESULT_SUCCESS, res); + } uint32_t deviceCount = 0; res = zeDeviceGet(driverHandle->toHandle(), &deviceCount, nullptr); - uint32_t totalRootDevices = rootDevice0Exposed + rootDevice1Exposed; EXPECT_EQ(ZE_RESULT_SUCCESS, res); EXPECT_EQ(deviceCount, totalRootDevices); diff --git a/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_sysfs_engine.h b/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_sysfs_engine.h index e667b80231..e1c4189388 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_sysfs_engine.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_sysfs_engine.h @@ -39,7 +39,8 @@ struct Mock : public EngineSysfsAccess { return ZE_RESULT_SUCCESS; } - Mock() = default; + Mock() = default; + ~Mock() override = default; }; class PublicLinuxEngineImp : public L0::LinuxEngineImp { public: diff --git a/level_zero/tools/test/unit_tests/sources/sysman/frequency/linux/mock_sysfs_frequency.h b/level_zero/tools/test/unit_tests/sources/sysman/frequency/linux/mock_sysfs_frequency.h index c54a3c1c56..c4b485625f 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/frequency/linux/mock_sysfs_frequency.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/frequency/linux/mock_sysfs_frequency.h @@ -105,7 +105,8 @@ struct Mock : public FrequencySysfsAccess { return ZE_RESULT_SUCCESS; } - Mock() = default; + Mock() = default; + ~Mock() override = default; }; class PublicLinuxFrequencyImp : public L0::LinuxFrequencyImp { diff --git a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler.h b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler.h index 1547c0fb85..63c0242617 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler.h @@ -58,7 +58,8 @@ struct Mock : public SysfsAccess { return ZE_RESULT_SUCCESS; } - Mock() = default; + Mock() = default; + ~Mock() override = default; MOCK_METHOD2(read, ze_result_t(const std::string file, uint64_t &val)); MOCK_METHOD2(write, ze_result_t(const std::string file, const uint64_t val)); diff --git a/level_zero/tools/test/unit_tests/sources/sysman/standby/linux/mock_sysfs_standby.h b/level_zero/tools/test/unit_tests/sources/sysman/standby/linux/mock_sysfs_standby.h index 9eafa7c45b..2b14ef2f7f 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/standby/linux/mock_sysfs_standby.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/standby/linux/mock_sysfs_standby.h @@ -49,7 +49,8 @@ struct Mock : public StandbySysfsAccess { return ZE_RESULT_SUCCESS; } - Mock() = default; + Mock() = default; + ~Mock() override = default; }; class PublicLinuxStandbyImp : public L0::LinuxStandbyImp { diff --git a/level_zero/tools/test/unit_tests/sources/sysman/sysman_device/linux/mock_sysfs_sysman_device.h b/level_zero/tools/test/unit_tests/sources/sysman/sysman_device/linux/mock_sysfs_sysman_device.h index fa4c136aa5..faa550b1f2 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/sysman_device/linux/mock_sysfs_sysman_device.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/sysman_device/linux/mock_sysfs_sysman_device.h @@ -88,7 +88,8 @@ struct Mock : public SysfsAccess { return ZE_RESULT_SUCCESS; } - Mock() = default; + Mock() = default; + ~Mock() override = default; MOCK_METHOD2(read, ze_result_t(const std::string file, std::string &val)); MOCK_METHOD2(read, ze_result_t(const std::string file, uint64_t &val));