diff --git a/oec-hardware-1.1.5-4-fix-gpu-testcase-bug.patch b/oec-hardware-1.1.5-4-fix-gpu-testcase-bug.patch new file mode 100644 index 0000000..badc83f --- /dev/null +++ b/oec-hardware-1.1.5-4-fix-gpu-testcase-bug.patch @@ -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( diff --git a/oec-hardware.spec b/oec-hardware.spec index f941389..ae2d9ce 100644 --- a/oec-hardware.spec +++ b/oec-hardware.spec @@ -6,7 +6,7 @@ Name: oec-hardware Summary: openEuler Hardware Compatibility Test Suite Version: 1.1.5 -Release: 3 +Release: 4 Group: Development/Tools License: Mulan PSL v2 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 Patch0002: oec-hardware-1.1.5-2-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 BuildRequires: gcc @@ -42,6 +43,7 @@ openEuler Hardware Compatibility Test Server %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %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 %changelog +* Fri Jun 7 2024 xiaochn - 1.1.5-4 +- Resolve the issue of executing Vulkan even if DISPLAY is not defined in the env + * Tue Jun 4 2024 xiaochn - 1.1.5-3 - 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