packages/oec-hardware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决gpu测试项DISPLAY判断问题

Browse Source 
(cherry picked from commit 273617cf89de68f518f41a5568999a28e7d39b17)
This commit is contained in:
Alwill Xiao(肖传楠) 2024-06-07 17:05:41 +08:00 committed by openeuler-sync-bot
parent 3638dd0cf3
commit 2446ee4316
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oec-hardware-1.1.5-4-fix-gpu-testcase-bug.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur rpm/tests/compatible/gpu/nvidia_gpu.py oech/tests/compatible/gpu/nvidia_gpu.py
--- rpm/tests/compatible/gpu/nvidia_gpu.py 2024-06-07 16:37:44.542417257 +0800
+++ oech/tests/compatible/gpu/nvidia_gpu.py 2024-06-07 16:38:57.149472108 +0800
@@ -174,7 +174,7 @@
self.logger.error("Using nvidia-smi to test Drvier failed.")
env_display = os.getenv('DISPLAY')
- if env_display != '':
+ if env_display is not None and env_display != '':
self.logger.info("Start to test Vulkan.")
self.set_default_gpu()
code = self.command.run_cmd(

7
oec-hardware.spec
View File

@ -6,7 +6,7 @@
Name: oec-hardware Name: oec-hardware
Summary: openEuler Hardware Compatibility Test Suite Summary: openEuler Hardware Compatibility Test Suite
Version: 1.1.5 Version: 1.1.5
Release: 3 Release: 4
Group: Development/Tools Group: Development/Tools
License: Mulan PSL v2 License: Mulan PSL v2
URL: https://gitee.com/openeuler/oec-hardware URL: https://gitee.com/openeuler/oec-hardware
@ -16,6 +16,7 @@ Source0: https://gitee.com/openeuler/oec-hardware/repository/archive/v%{v
Patch0001: oec-hardware-1.1.5-1-add-virtual-branch-fix-bug.patch Patch0001: oec-hardware-1.1.5-1-add-virtual-branch-fix-bug.patch
Patch0002: oec-hardware-1.1.5-2-fix-bug.patch Patch0002: oec-hardware-1.1.5-2-fix-bug.patch
Patch0003: oec-hardware-1.1.5-3-functional-optimization-fix-bug.patch Patch0003: oec-hardware-1.1.5-3-functional-optimization-fix-bug.patch
Patch0004: oec-hardware-1.1.5-4-fix-gpu-testcase-bug.patch
Buildroot: %{_tmppath}/%{name}-%{version}-root Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gcc BuildRequires: gcc
@ -42,6 +43,7 @@ openEuler Hardware Compatibility Test Server
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
%ifarch x86_64 aarch64 %ifarch x86_64 aarch64
@ -89,6 +91,9 @@ sed -i 's#grep openeulerversion /etc/openEuler-latest#grep %{vendor_lowercase}ve
rm -rf /var/lock/oech.lock rm -rf /var/lock/oech.lock
%changelog %changelog
* Fri Jun 7 2024 xiaochn <xiaochuannan@inspur.com> - 1.1.5-4
- Resolve the issue of executing Vulkan even if DISPLAY is not defined in the env
* Tue Jun 4 2024 xiaochn <xiaochuannan@inspur.com> - 1.1.5-3 * Tue Jun 4 2024 xiaochn <xiaochuannan@inspur.com> - 1.1.5-3
- Resolve the issue of different kernel source download locations in kabi test case - Resolve the issue of different kernel source download locations in kabi test case
- Resolve the issue that kabiwhitelist still passes when the ko and rpm file does not exist - Resolve the issue that kabiwhitelist still passes when the ko and rpm file does not exist