mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-04 16:10:10 +00:00
openhpi: update openhpi-fix-testfail-errors.patch
The openhpi-fix-testfail-errors.patch tries to fix 2 saftest failures. But the second fix is not correct. It should not return false when there is no surrogate pairs since for the code points in UTF-16 Basic Multilingual Plane (BMP), there is no need surrogate pairs. We should update saftest case to fix this failure. Also add more description for the first fix. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
f1cc8bf017
commit
fd793c0adb
|
|
@ -0,0 +1,35 @@
|
||||||
|
From e0b2be7a1fce0fed63bac8c350b711b69edfe30e Mon Sep 17 00:00:00 2001
|
||||||
|
From: "yanjun.zhu" <yanjun.zhu@windriver.com>
|
||||||
|
Date: Tue, 30 Apr 2019 10:04:58 +0800
|
||||||
|
Subject: [PATCH] openhpid/safhpi.c: fix function saHpiSensorThresholdsSet
|
||||||
|
|
||||||
|
In COPY_TH the SensorThresholds->TH will be copied to tmp.TH only if
|
||||||
|
TH.IsSupported == SAHPI_TRUE. So we should pass &tmp but not
|
||||||
|
SensorThresholds as the argument to OH_CALL_ABI. Otherwise the TH will
|
||||||
|
be set even if TH.IsSupported == SAHPI_FALSE.
|
||||||
|
|
||||||
|
Upstream-Status: Submitted
|
||||||
|
[https://github.com/open-hpi/openhpi/pull/2744/commits/77a78bb1ada56e55c5ba6d7a5987c214705bf035]
|
||||||
|
|
||||||
|
Signed-off-by: yanjun.zhu <yanjun.zhu@windriver.com>
|
||||||
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||||
|
---
|
||||||
|
openhpid/safhpi.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/openhpid/safhpi.c b/openhpid/safhpi.c
|
||||||
|
index 28a2632..61b7f03 100644
|
||||||
|
--- a/openhpid/safhpi.c
|
||||||
|
+++ b/openhpid/safhpi.c
|
||||||
|
@@ -1933,7 +1933,7 @@ SaErrorT SAHPI_API saHpiSensorThresholdsSet (
|
||||||
|
oh_release_domain(d); /* Unlock domain */
|
||||||
|
|
||||||
|
OH_CALL_ABI(h, set_sensor_thresholds, SA_ERR_HPI_INVALID_CMD, rv,
|
||||||
|
- ResourceId, SensorNum, SensorThresholds);
|
||||||
|
+ ResourceId, SensorNum, &tmp);
|
||||||
|
oh_release_handler(h);
|
||||||
|
|
||||||
|
return rv;
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
Fix for saftest failures.
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: yanjun.zhu <yanjun.zhu@windriver.com>
|
|
||||||
|
|
||||||
Index: openhpi-3.6.1/openhpid/safhpi.c
|
|
||||||
===================================================================
|
|
||||||
--- openhpi-3.6.1.orig/openhpid/safhpi.c
|
|
||||||
+++ openhpi-3.6.1/openhpid/safhpi.c
|
|
||||||
@@ -1933,7 +1933,7 @@ SaErrorT SAHPI_API saHpiSensorThresholds
|
|
||||||
oh_release_domain(d); /* Unlock domain */
|
|
||||||
|
|
||||||
OH_CALL_ABI(h, set_sensor_thresholds, SA_ERR_HPI_INVALID_CMD, rv,
|
|
||||||
- ResourceId, SensorNum, SensorThresholds);
|
|
||||||
+ ResourceId, SensorNum, &tmp);
|
|
||||||
oh_release_handler(h);
|
|
||||||
|
|
||||||
return rv;
|
|
||||||
Index: openhpi-3.6.1/utils/sahpi_struct_utils.c
|
|
||||||
===================================================================
|
|
||||||
--- openhpi-3.6.1.orig/utils/sahpi_struct_utils.c
|
|
||||||
+++ openhpi-3.6.1/utils/sahpi_struct_utils.c
|
|
||||||
@@ -3861,6 +3861,9 @@ SaHpiBoolT oh_valid_textbuffer(SaHpiText
|
|
||||||
/* found a unpaired surrogate */
|
|
||||||
return SAHPI_FALSE;
|
|
||||||
}
|
|
||||||
+ } else {
|
|
||||||
+ /*the first 2 bytes wrong*/
|
|
||||||
+ return SAHPI_FALSE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
@ -33,7 +33,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
|
||||||
file://openhpi-glib-cross-compile.patch \
|
file://openhpi-glib-cross-compile.patch \
|
||||||
file://openhpi-linkfix.patch \
|
file://openhpi-linkfix.patch \
|
||||||
file://openhpi-fix-host-gcc.patch \
|
file://openhpi-fix-host-gcc.patch \
|
||||||
file://openhpi-fix-testfail-errors.patch \
|
file://openhpi-fix-function-saHpiSensorThresholds.patch \
|
||||||
file://openhpi-add-libnetsnmp-when-link.patch \
|
file://openhpi-add-libnetsnmp-when-link.patch \
|
||||||
file://openhpi-invalide-session.patch \
|
file://openhpi-invalide-session.patch \
|
||||||
file://openhpi-use-serial-tests-config-needed-by-ptest.patch \
|
file://openhpi-use-serial-tests-config-needed-by-ptest.patch \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user