chore: avoid error in vulkan when running tests

This commit is contained in:
Ilya Zlobintsev 2025-01-05 15:27:03 +02:00
parent 14429fd67c
commit 543265ddb2
14 changed files with 131 additions and 12 deletions

View File

@ -10,7 +10,7 @@ use vulkano::{
#[cfg_attr(test, allow(unreachable_code, unused_variables))] #[cfg_attr(test, allow(unreachable_code, unused_variables))]
pub fn get_vulkan_info(pci_info: &GpuPciInfo) -> anyhow::Result<VulkanInfo> { pub fn get_vulkan_info(pci_info: &GpuPciInfo) -> anyhow::Result<VulkanInfo> {
#[cfg(test)] #[cfg(test)]
return Err(anyhow!("Not allowed in tests")); return Ok(VulkanInfo::default());
trace!("Reading vulkan info"); trace!("Reading vulkan info");
let vendor_id = u32::from_str_radix(&pci_info.device_pci_info.vendor_id, 16)?; let vendor_id = u32::from_str_radix(&pci_info.device_pci_info.vendor_id, 16)?;

View File

@ -22,6 +22,16 @@ expression: device_info
"vendor": "PC Partner Limited / Sapphire Technology", "vendor": "PC Partner Limited / Sapphire Technology",
"vendor_id": "174B" "vendor_id": "174B"
} }
},
"vulkan_info": {
"api_version": "",
"device_name": "",
"driver": {
"version": 0
},
"enabled_layers": [],
"extensions": {},
"features": {}
} }
}, },
"pci_info": { "pci_info": {

View File

@ -23,7 +23,17 @@ expression: device_info
"vendor_id": "1458" "vendor_id": "1458"
} }
}, },
"vbios_version": "xxx-xxx-xxx" "vbios_version": "xxx-xxx-xxx",
"vulkan_info": {
"api_version": "",
"device_name": "",
"driver": {
"version": 0
},
"enabled_layers": [],
"extensions": {},
"features": {}
}
}, },
"pci_info": { "pci_info": {
"device_pci_info": { "device_pci_info": {

View File

@ -98,7 +98,17 @@ expression: device_info
"vendor_id": "1DA2" "vendor_id": "1DA2"
} }
}, },
"vbios_version": "113-D1990103-O09" "vbios_version": "113-D1990103-O09",
"vulkan_info": {
"api_version": "",
"device_name": "",
"driver": {
"version": 0
},
"enabled_layers": [],
"extensions": {},
"features": {}
}
}, },
"pci_info": { "pci_info": {
"device_pci_info": { "device_pci_info": {

View File

@ -98,7 +98,17 @@ expression: device_info
"vendor_id": "1DA2" "vendor_id": "1DA2"
} }
}, },
"vbios_version": "113-1E3871U-O4C" "vbios_version": "113-1E3871U-O4C",
"vulkan_info": {
"api_version": "",
"device_name": "",
"driver": {
"version": 0
},
"enabled_layers": [],
"extensions": {},
"features": {}
}
}, },
"pci_info": { "pci_info": {
"device_pci_info": { "device_pci_info": {

View File

@ -23,7 +23,17 @@ expression: device_info
"vendor_id": "1EAE" "vendor_id": "1EAE"
} }
}, },
"vbios_version": "113-23L86HMD2-D02" "vbios_version": "113-23L86HMD2-D02",
"vulkan_info": {
"api_version": "",
"device_name": "",
"driver": {
"version": 0
},
"enabled_layers": [],
"extensions": {},
"features": {}
}
}, },
"pci_info": { "pci_info": {
"device_pci_info": { "device_pci_info": {

View File

@ -59,7 +59,17 @@ expression: device_info
"vendor_id": "1DA2" "vendor_id": "1DA2"
} }
}, },
"vbios_version": "113-D4121EXT-CO1" "vbios_version": "113-D4121EXT-CO1",
"vulkan_info": {
"api_version": "",
"device_name": "",
"driver": {
"version": 0
},
"enabled_layers": [],
"extensions": {},
"features": {}
}
}, },
"pci_info": { "pci_info": {
"device_pci_info": { "device_pci_info": {

View File

@ -23,7 +23,17 @@ expression: device_info
"vendor_id": "F111" "vendor_id": "F111"
} }
}, },
"vbios_version": "113-BRT125778.001" "vbios_version": "113-BRT125778.001",
"vulkan_info": {
"api_version": "",
"device_name": "",
"driver": {
"version": 0
},
"enabled_layers": [],
"extensions": {},
"features": {}
}
}, },
"pci_info": { "pci_info": {
"device_pci_info": { "device_pci_info": {

View File

@ -61,7 +61,17 @@ expression: device_info
"vendor_id": "1DA2" "vendor_id": "1DA2"
} }
}, },
"vbios_version": "113-D70401XT-N11" "vbios_version": "113-D70401XT-N11",
"vulkan_info": {
"api_version": "",
"device_name": "",
"driver": {
"version": 0
},
"enabled_layers": [],
"extensions": {},
"features": {}
}
}, },
"pci_info": { "pci_info": {
"device_pci_info": { "device_pci_info": {

View File

@ -103,7 +103,17 @@ expression: device_info
"vendor_id": "1043" "vendor_id": "1043"
} }
}, },
"vbios_version": "115-D050PIL-100" "vbios_version": "115-D050PIL-100",
"vulkan_info": {
"api_version": "",
"device_name": "",
"driver": {
"version": 0
},
"enabled_layers": [],
"extensions": {},
"features": {}
}
}, },
"pci_info": { "pci_info": {
"device_pci_info": { "device_pci_info": {

View File

@ -35,6 +35,16 @@ expression: device_info
"vendor": "Lenovo", "vendor": "Lenovo",
"vendor_id": "17AA" "vendor_id": "17AA"
} }
},
"vulkan_info": {
"api_version": "",
"device_name": "",
"driver": {
"version": 0
},
"enabled_layers": [],
"extensions": {},
"features": {}
} }
}, },
"pci_info": { "pci_info": {

View File

@ -1,7 +1,6 @@
--- ---
source: lact-daemon/src/tests/mod.rs source: lact-daemon/src/tests/mod.rs
expression: device_info expression: device_info
snapshot_kind: text
--- ---
{ {
"clocks_info": { "clocks_info": {
@ -36,6 +35,16 @@ snapshot_kind: text
"vendor": "Lenovo", "vendor": "Lenovo",
"vendor_id": "17AA" "vendor_id": "17AA"
} }
},
"vulkan_info": {
"api_version": "",
"device_name": "",
"driver": {
"version": 0
},
"enabled_layers": [],
"extensions": {},
"features": {}
} }
}, },
"pci_info": { "pci_info": {

View File

@ -22,6 +22,16 @@ expression: device_info
"vendor": "Micro-Star International Co., Ltd. [MSI]", "vendor": "Micro-Star International Co., Ltd. [MSI]",
"vendor_id": "1462" "vendor_id": "1462"
} }
},
"vulkan_info": {
"api_version": "",
"device_name": "",
"driver": {
"version": 0
},
"enabled_layers": [],
"extensions": {},
"features": {}
} }
}, },
"pci_info": { "pci_info": {

View File

@ -209,7 +209,7 @@ pub struct LinkInfo {
pub max_speed: Option<String>, pub max_speed: Option<String>,
} }
#[derive(Serialize, Deserialize, Debug, Clone)] #[derive(Serialize, Deserialize, Debug, Clone, Default)]
pub struct VulkanInfo { pub struct VulkanInfo {
pub device_name: String, pub device_name: String,
pub api_version: String, pub api_version: String,
@ -220,7 +220,7 @@ pub struct VulkanInfo {
} }
#[skip_serializing_none] #[skip_serializing_none]
#[derive(Serialize, Deserialize, Debug, Clone)] #[derive(Serialize, Deserialize, Debug, Clone, Default)]
pub struct VulkanDriverInfo { pub struct VulkanDriverInfo {
pub version: u32, pub version: u32,
pub name: Option<String>, pub name: Option<String>,