Cleanup linux dll tests

- include headers from absolute paths
- restore changed global state in TearDown()

Change-Id: I81fab71aabc0df9d995928e75611681288951916
Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2019-03-28 12:53:48 +01:00
parent d4c8791359
commit da3e483703
3 changed files with 47 additions and 27 deletions

View File

@@ -14,11 +14,12 @@
#include "test.h"
#include "unit_tests/custom_event_listener.h"
#include "unit_tests/helpers/debug_manager_state_restore.h"
#include "unit_tests/helpers/variable_backup.h"
#include "unit_tests/linux/mock_os_layer.h"
#include "unit_tests/os_interface/linux/device_command_stream_fixture.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "mock_os_layer.h"
#include <string>
@@ -37,12 +38,10 @@ class DrmWrap : public Drm {
class DrmTestsFixture {
public:
void SetUp() {
//make static things into initial state
DrmWrap::closeDevice(0);
resetOSMockGlobalState();
}
void TearDown() {
DrmWrap::closeDevice(0);
}
};
@@ -98,6 +97,9 @@ TEST_F(DrmTests, createReturnsDrm) {
drm_i915_getparam_t getParam;
int lDeviceId;
VariableBackup<decltype(ioctlCnt)> backupIoctlCnt(&ioctlCnt);
VariableBackup<int> backupIoctlSeq(&ioctlSeq[0]);
ioctlCnt = 0;
ioctlSeq[0] = -1;
errno = EINTR;
@@ -138,12 +140,15 @@ TEST_F(DrmTests, createTwiceReturnsSameDrm) {
}
TEST_F(DrmTests, createDriFallback) {
VariableBackup<decltype(haveDri)> backupHaveDri(&haveDri);
haveDri = 1;
auto drm = DrmWrap::createDrm(0);
EXPECT_NE(drm, nullptr);
}
TEST_F(DrmTests, createNoDevice) {
VariableBackup<decltype(haveDri)> backupHaveDri(&haveDri);
haveDri = -1;
auto drm = DrmWrap::createDrm(0);
EXPECT_EQ(drm, nullptr);
@@ -158,9 +163,11 @@ TEST_F(DrmTests, createNoOverrun) {
}
TEST_F(DrmTests, createUnknownDevice) {
DebugManagerStateRestore dbgRestore;
DebugManagerStateRestore dbgRestorer;
DebugManager.flags.PrintDebugMessages.set(true);
VariableBackup<decltype(deviceId)> backupDeviceId(&deviceId);
deviceId = -1;
::testing::internal::CaptureStderr();
@@ -171,6 +178,7 @@ TEST_F(DrmTests, createUnknownDevice) {
}
TEST_F(DrmTests, createNoSoftPin) {
VariableBackup<decltype(haveSoftPin)> backupHaveSoftPin(&haveSoftPin);
haveSoftPin = 0;
auto drm = DrmWrap::createDrm(0);
@@ -178,6 +186,7 @@ TEST_F(DrmTests, createNoSoftPin) {
}
TEST_F(DrmTests, failOnDeviceId) {
VariableBackup<decltype(failOnDeviceId)> backupFailOnDeviceId(&failOnDeviceId);
failOnDeviceId = -1;
auto drm = DrmWrap::createDrm(0);
@@ -185,6 +194,7 @@ TEST_F(DrmTests, failOnDeviceId) {
}
TEST_F(DrmTests, failOnRevisionId) {
VariableBackup<decltype(failOnRevisionId)> backupFailOnRevisionId(&failOnRevisionId);
failOnRevisionId = -1;
auto drm = DrmWrap::createDrm(0);
@@ -192,6 +202,7 @@ TEST_F(DrmTests, failOnRevisionId) {
}
TEST_F(DrmTests, failOnSoftPin) {
VariableBackup<decltype(failOnSoftPin)> backupFailOnSoftPin(&failOnSoftPin);
failOnSoftPin = -1;
auto drm = DrmWrap::createDrm(0);
@@ -199,6 +210,7 @@ TEST_F(DrmTests, failOnSoftPin) {
}
TEST_F(DrmTests, failOnParamBoost) {
VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost);
failOnParamBoost = -1;
auto drm = DrmWrap::createDrm(0);
@@ -208,6 +220,9 @@ TEST_F(DrmTests, failOnParamBoost) {
#ifdef SUPPORT_BDW
TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenBdwDeviceIsCreatedThenSimplifiedMocsSelectionIsFalse) {
VariableBackup<decltype(deviceId)> backupDeviceId(&deviceId);
VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost);
deviceId = IBDW_GT3_WRK_DEVICE_F0_ID;
failOnParamBoost = -1;
auto drm = DrmWrap::createDrm(0);
@@ -218,6 +233,9 @@ TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenBdwDeviceIsCreatedThenSim
#ifdef SUPPORT_SKL
TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenSklDeviceIsCreatedThenSimplifiedMocsSelectionIsTrue) {
VariableBackup<decltype(deviceId)> backupDeviceId(&deviceId);
VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost);
deviceId = ISKL_GT2_DT_DEVICE_F0_ID;
failOnParamBoost = -1;
auto drm = DrmWrap::createDrm(0);
@@ -227,6 +245,9 @@ TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenSklDeviceIsCreatedThenSim
#endif
#ifdef SUPPORT_KBL
TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenKblDeviceIsCreatedThenSimplifiedMocsSelectionIsTrue) {
VariableBackup<decltype(deviceId)> backupDeviceId(&deviceId);
VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost);
deviceId = IKBL_GT1_ULT_DEVICE_F0_ID;
failOnParamBoost = -1;
auto drm = DrmWrap::createDrm(0);
@@ -236,6 +257,9 @@ TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenKblDeviceIsCreatedThenSim
#endif
#ifdef SUPPORT_BXT
TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenBxtDeviceIsCreatedThenSimplifiedMocsSelectionIsTrue) {
VariableBackup<decltype(deviceId)> backupDeviceId(&deviceId);
VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost);
deviceId = IBXT_X_DEVICE_F0_ID;
failOnParamBoost = -1;
auto drm = DrmWrap::createDrm(0);
@@ -245,6 +269,9 @@ TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenBxtDeviceIsCreatedThenSim
#endif
#ifdef SUPPORT_GLK
TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenGlkDeviceIsCreatedThenSimplifiedMocsSelectionIsTrue) {
VariableBackup<decltype(deviceId)> backupDeviceId(&deviceId);
VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost);
deviceId = IGLK_GT2_ULT_18EU_DEVICE_F0_ID;
failOnParamBoost = -1;
auto drm = DrmWrap::createDrm(0);
@@ -254,6 +281,9 @@ TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenGlkDeviceIsCreatedThenSim
#endif
#ifdef SUPPORT_CFL
TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenCflDeviceIsCreatedThenSimplifiedMocsSelectionIsTrue) {
VariableBackup<decltype(deviceId)> backupDeviceId(&deviceId);
VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost);
deviceId = ICFL_GT1_S61_DT_DEVICE_F0_ID;
failOnParamBoost = -1;
auto drm = DrmWrap::createDrm(0);
@@ -269,6 +299,8 @@ TEST_F(DrmTests, givenKernelSupportingTurboPatchWhenDeviceIsCreatedThenSimplifie
}
TEST_F(DrmTests, failOnContextCreate) {
VariableBackup<decltype(failOnContextCreate)> backupFailOnContextCreate(&failOnContextCreate);
auto drm = DrmWrap::createDrm(0);
EXPECT_NE(drm, nullptr);
failOnContextCreate = -1;
@@ -282,6 +314,8 @@ TEST_F(DrmTests, failOnContextCreate) {
}
TEST_F(DrmTests, failOnSetPriority) {
VariableBackup<decltype(failOnSetPriority)> backupFailOnSetPriority(&failOnSetPriority);
auto drm = DrmWrap::createDrm(0);
EXPECT_NE(drm, nullptr);
failOnSetPriority = -1;
@@ -296,6 +330,8 @@ TEST_F(DrmTests, failOnSetPriority) {
}
TEST_F(DrmTests, failOnDrmGetVersion) {
VariableBackup<decltype(failOnDrmVersion)> backupFailOnDrmVersion(&failOnDrmVersion);
failOnDrmVersion = -1;
auto drm = DrmWrap::createDrm(0);
EXPECT_EQ(drm, nullptr);
@@ -307,6 +343,8 @@ TEST_F(DrmTests, failOnDrmGetVersion) {
}
TEST_F(DrmTests, failOnInvalidDeviceName) {
VariableBackup<decltype(failOnDrmVersion)> backupFailOnDrmVersion(&failOnDrmVersion);
strcpy(providedDrmVersion, "NA");
auto drm = DrmWrap::createDrm(0);
EXPECT_EQ(drm, nullptr);