Skip to content

v2.0.x: fortran/base: rename strings.h into fortran_base_strings.h #3675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

ggouaillardet
Copy link
Contributor

rename ompi/mpi/fortran/base/strings.h so it does not get pulled
when /usr/include/strings.h is expected.

Refs #3639

Signed-off-by: Gilles Gouaillardet [email protected]

(cherry picked from commit 08526e8)

rename ompi/mpi/fortran/base/strings.h so it does not get pulled
when /usr/include/strings.h is expected.

Refs open-mpi#3639

Signed-off-by: Gilles Gouaillardet <[email protected]>

(cherry picked from commit open-mpi/ompi@08526e8)
@ggouaillardet ggouaillardet added this to the v2.0.4 milestone Jun 8, 2017
@ggouaillardet ggouaillardet requested a review from bwbarrett June 8, 2017 00:47
@ggouaillardet
Copy link
Contributor Author

@bwbarrett i checked (only) the free bsd platform.
build was successful, but the overall test failed because --get-stack-traces is a mpirun option that is valid only from v2.x
could you please update your jenkins scripts accordingly ?

@bwbarrett
Copy link
Member

yeah, there's a check in the script for version to avoid that bug; not sure what's happening. Unfortunately, I won't be able to look at it in the next week due to meetings and vacation.

@jsquyres
Copy link
Member

jsquyres commented Jun 8, 2017

@bwbarrett Looks like the PRB failed because it's trying to use --get-stack-traces, but that isn't understood here on the v2.0.x branch.

@hppritcha
Copy link
Member

bot:lanl:retest

@bwbarrett
Copy link
Member

@jsquyres yeah, I got that part. I found the bug; a bad regex for the versions that do / do not support --get-stack-traces. We matched the 1.x series, but not the 2.0.x series properly. Fixed now (I think), although Howard's current build is going to fail same as the first one...

@hppritcha
Copy link
Member

are we ready to have jenkins get another go at this one?

@bwbarrett
Copy link
Member

Yeah, I pushed what I think is the fix on Thursday.

bot:ompi:retest

@hppritcha
Copy link
Member

hmm.. looks like we're still picking up the --get-stack-traces

@jsquyres
Copy link
Member

bot:ompi:retest

@jsquyres
Copy link
Member

(open-mpi/ompi-scripts#2 should have fixed the --get-stack-traces issue on BSD)

@jsquyres
Copy link
Member

Try again, with open-mpi/ompi-scripts#3...

bot:ompi:retest

@jsquyres jsquyres merged commit 9473688 into open-mpi:v2.0.x Jun 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants