Skip to content
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

Add support for <fullTestName>_SET_RUN_SERIAL=[ON|OFF] (trilinos/Trilinos#7112) #328

Merged
merged 4 commits into from
Sep 19, 2020

Conversation

bartlettroscoe
Copy link
Member

This PR implements support for the option <fullTestName>_SET_RUN_SERIAL=[ON|OFF] described in trilinos/Trilinos#7112. This will be used on the Trilinos side immediately to set RUN_SERIAL on several Trilinos tests that are timing out in one of the builds on 'ride'. (I tested and setting RUN_SERIAL eliminates these timeouts. I will document that testing more completely in the matching Trilinos PR shortly.)

How was this tested?

There are strong unit tests for this and, again, I validated this against Trilinos. I used this TriBITS branch with a matching Trilinos branch to run the full build Trilinos-atdm-white-ride-gnu-7.2.0-openmp-debug-exp which posted to CDash:

Looking at the configure results showed:

-- Setting default Intrepid2_unit-test_Projection_OpenMP_Test_Convergence_HEX_MPI_1_SET_RUN_SERIAL=ON
....
-- Intrepid2_unit-test_Projection_Serial_Test_Convergence_HEX_MPI_1: Added test (BASIC, NUM_MPI_PROCS=1, PROCESSORS=1, RUN_SERIAL)!

and the cache file showed:

Intrepid2_unit-test_Projection_OpenMP_Test_Convergence_HEX_MPI_1_SET_RUN_SERIAL:BOOL=ON

Again, more validation evidence will be given in the matching Trilinos PR that will be created shortly.

TriBITSPub#173, trilinos/Trilinos#7112)

Turns out that TRIBITS_ADD_TEST() had bad logic for reading in
<fullTestName>_SET_RUN_SERIAL and <fullTestName>_SET_DISABLED_AND_MSG
when the test name is modifed by setting TPL_ENABLE_MPI=ON or passing in
NAME_POSTFIX or POSTFIX_AND_ARGS_<IDX> arguments.

These are obvious use cases that I missed and they are needed for
trilinos/Trilinos#7112 and in general, obviously.

This means that <fullTestName>_SET_DISABLED_AND_MSG was not implemented
correctly for TRIBITS_ADD_TEST() as part of TriBITSPub#173.  Turns out the driving
use case for that was using TRIBITS_ADD_ADVACED_TEST() so we never noticed
the bug.

The next commit will fix this (which I already prototyped).
…e modifications (#7112)

This makes the updated (failing) unit tests in the last commit pass (see that
commit message for details).
@bartlettroscoe bartlettroscoe merged commit cee1980 into TriBITSPub:master Sep 19, 2020
bartlettroscoe added a commit to trilinos/Trilinos that referenced this pull request Sep 19, 2020
Origin repo remote tracking branch: 'github/master'
Origin repo remote repo URL: 'github = [email protected]:TriBITSPub/TriBITS.git'

At commit:

commit cee1980d053ec2c26301d2389c8b0a677fa262fe
Author:  Roscoe A. Bartlett <[email protected]>
Date:    Sat Sep 19 07:40:49 2020 -0600
Summary: Merge remote-tracking branch 'rab-github/tril-7112-run-serial' (#7112)

This represents the changes in the TriBITS PRs:

* TriBITSPub/TriBITS#327 : Fix install for MacOSX (#7881)

* TriBITSPub/TriBITS#328 : Add support for
  <fullTestName>_SET_RUN_SERIAL=[ON|OFF] (#7112)
@bartlettroscoe
Copy link
Member Author

@jmgate, any time to review this one?

Copy link
Collaborator

@e10harvey e10harvey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, everything looks great. I do have some questions about the unit tests; I want to confirm that -DTEST_NAME_SET_RUN_SERIAL=OFF works.

@bartlettroscoe
Copy link
Member Author

@e10harvey, thanks for the helpful review. I think the updated unit tests will be better given you feedback. (I will post a follow-on PR for those fixes.)

@jmgate
Copy link
Collaborator

jmgate commented Sep 22, 2020

Sorry, @bartlettroscoe, I didn't get a notification again. I've tweaked my notification settings one more time to see if the emails finally start coming in.

@jmgate
Copy link
Collaborator

jmgate commented Sep 24, 2020

@bartlettroscoe, I'm remembering from a long time ago that there are occasionally issues that come up with GitHub notification emails not getting through to Sandia email addresses. Do you recall any details of that problem, or what the solution was?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants