add test suite patches
Signed-off-by: Philip Kovacs <pkdevel@yahoo.com>
This commit is contained in:
parent
7fc5450a48
commit
4a4de9d2d6
@ -8,6 +8,9 @@ Source0: https://github.com/pmix/%{name}/releases/download/v%{version}/%{
|
|||||||
|
|
||||||
# Remove configure check for C++ since requires only C
|
# Remove configure check for C++ since requires only C
|
||||||
Patch0: pmix_remove_cxx_lang.patch
|
Patch0: pmix_remove_cxx_lang.patch
|
||||||
|
# Fix pointer casts/derefs in test suite
|
||||||
|
Patch1: pmix_pointer_casts_1.patch
|
||||||
|
Patch2: pmix_pointer_casts_2.patch
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -58,6 +61,8 @@ based starters (e.g., mpirun).
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
echo touching lexer sources to recompile them ...
|
echo touching lexer sources to recompile them ...
|
||||||
find src -name \*.l -print -exec touch --no-create {} \;
|
find src -name \*.l -print -exec touch --no-create {} \;
|
||||||
@ -153,7 +158,7 @@ EOF
|
|||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Jul 5 2019 Philip Kovacs <pkdevel@yahoo.com> - 3.1.3-1
|
* Sat Jul 13 2019 Philip Kovacs <pkdevel@yahoo.com> - 3.1.3-1
|
||||||
- Update to 3.1.3
|
- Update to 3.1.3
|
||||||
|
|
||||||
* Tue Jul 2 2019 Philip Kovacs <pkdevel@yahoo.com> - 3.1.2-2
|
* Tue Jul 2 2019 Philip Kovacs <pkdevel@yahoo.com> - 3.1.2-2
|
||||||
|
59
pmix_pointer_casts_1.patch
Normal file
59
pmix_pointer_casts_1.patch
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
commit 3a7defdec3049b204e602f6fd9d5c5a71bf1df7d
|
||||||
|
Author: Philip Kovacs <pkdevel@yahoo.com>
|
||||||
|
Date: Tue Jul 9 02:25:53 2019 -0400
|
||||||
|
|
||||||
|
fix incorrect pointer casts/derefs
|
||||||
|
|
||||||
|
Signed-off-by: Philip Kovacs <pkdevel@yahoo.com>
|
||||||
|
|
||||||
|
diff --git a/test/test_server.c b/test/test_server.c
|
||||||
|
index aa897fb5..d0ab53ce 100644
|
||||||
|
--- a/test/test_server.c
|
||||||
|
+++ b/test/test_server.c
|
||||||
|
@@ -187,7 +187,7 @@ static void server_unpack_procs(char *buf, size_t size)
|
||||||
|
char *nspace;
|
||||||
|
|
||||||
|
while ((size_t)(ptr - buf) < size) {
|
||||||
|
- ns_count = (size_t)*ptr;
|
||||||
|
+ ns_count = *(size_t *)ptr;
|
||||||
|
ptr += sizeof(size_t);
|
||||||
|
|
||||||
|
for (i = 0; i < ns_count; i++) {
|
||||||
|
@@ -201,10 +201,10 @@ static void server_unpack_procs(char *buf, size_t size)
|
||||||
|
nspace = ptr;
|
||||||
|
ptr += PMIX_MAX_NSLEN+1;
|
||||||
|
|
||||||
|
- ntasks = (size_t)*ptr;
|
||||||
|
+ ntasks = *(size_t *)ptr;
|
||||||
|
ptr += sizeof(size_t);
|
||||||
|
|
||||||
|
- ltasks = (size_t)*ptr;
|
||||||
|
+ ltasks = *(size_t *)ptr;
|
||||||
|
ptr += sizeof(size_t);
|
||||||
|
|
||||||
|
PMIX_LIST_FOREACH(tmp, server_nspace, server_nspace_t) {
|
||||||
|
@@ -226,7 +226,7 @@ static void server_unpack_procs(char *buf, size_t size)
|
||||||
|
}
|
||||||
|
size_t i;
|
||||||
|
for (i = 0; i < ltasks; i++) {
|
||||||
|
- int rank = (int)*ptr;
|
||||||
|
+ int rank = *(int *)ptr;
|
||||||
|
ptr += sizeof(int);
|
||||||
|
if (ns_item->task_map[rank] >= 0) {
|
||||||
|
continue;
|
||||||
|
@@ -651,13 +651,13 @@ static void server_unpack_dmdx(char *buf, int *sender, pmix_proc_t *proc)
|
||||||
|
{
|
||||||
|
char *ptr = buf;
|
||||||
|
|
||||||
|
- *sender = (int)*ptr;
|
||||||
|
+ *sender = *(int *)ptr;
|
||||||
|
ptr += sizeof(int);
|
||||||
|
|
||||||
|
memcpy(proc->nspace, ptr, PMIX_MAX_NSLEN +1);
|
||||||
|
ptr += PMIX_MAX_NSLEN +1;
|
||||||
|
|
||||||
|
- proc->rank = (int)*ptr;
|
||||||
|
+ proc->rank = *(int *)ptr;
|
||||||
|
ptr += sizeof(int);
|
||||||
|
}
|
||||||
|
|
13
pmix_pointer_casts_2.patch
Normal file
13
pmix_pointer_casts_2.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/test/test_server.c b/test/test_server.c
|
||||||
|
index 981a6604..ee91afd9 100644
|
||||||
|
--- a/test/test_server.c
|
||||||
|
+++ b/test/test_server.c
|
||||||
|
@@ -195,7 +195,7 @@ static void server_unpack_procs(char *buf, size_t size)
|
||||||
|
size_t ltasks, ntasks;
|
||||||
|
int server_id;
|
||||||
|
|
||||||
|
- server_id = *ptr;
|
||||||
|
+ server_id = *(int *)ptr;
|
||||||
|
ptr += sizeof(int);
|
||||||
|
|
||||||
|
nspace = ptr;
|
Loading…
Reference in New Issue
Block a user