Commit 573952cc authored by Kochunas, Brendan M.'s avatar Kochunas, Brendan M.
Browse files

Hotfix checkin test extracmake

Squash branch 'HOTFIX_checkin_test_extracmake' into 'master'

* Fixing --extra-cmake-options in the checkin-test.py file.

We are adding a new CMake config option for a new rational fraction approximation of the 1-exp(x) for the MOC in MPACT.
To properly test this in the pipeline we need to enable this configure option with TriBITSs ```checkin-test.py```'s ```--extra-cmake-options``` option. In attempting this we found that TriBITS does not correctly parse the input for this option.

We submitted a patch and pull request in TriBITS which has been accepted and merged into master here: https://github.com/TriBITSPub/TriBITS/pull/641

We are applying the same patch directly in Futility for expediency since updating TriBITS is somewhat of a heavy lift.

This only affects the behavior of the ```checkin-test.py``` and specifically how ```--extra-cmake-options``` is handled. And given that we have never encountered this issue before it is likely that at no point in our testing did we ever try to pass 2 CMake options to ```checkin-test.py``` via ```--extra-cmake-options```.

<!-- Include a link to VERA development issues if appropriate, or delete this line -->

**Developer Checklist:**
- [x] Have you done a self-review after creating the merge request?
- [x] Have you filled in the Merge Request information (title, description) thoroughly?
- [x] Have you updated the relevant tickets (if this MR is linked to any VERA-dev tickets)?
- [ ] Have you addressed all suggested feedback and commented on it to let the reviewer know? (Do not resolve discussions that the reviewer started)

**Reviewer Checklist:**
- [ ] Have you confirmed all discussions were adequately addressed and resolved them all?
- [x] Does it conform to formatting guidelines?
- [x] Are there adequate and clear comments?
- [x] Is the design clean and sensible?
- [x] Are the changes optimal/efficient?
- [x] Were sufficient DBC checks added?
- [x] Are there unit tests? (if necessary)
- [x] Is the MR description clear, including a link to the VERA-Dev issue if appropriate?

**PSM Checklist**
- [x] Have you confirmed that all discussions were addressed, or that follow-on issues have been created for them?
- [x] Have you confirmed sufficient testing was conducted?
- [x] Does this impact other repositories?
- [x] Does the MR have an adequate description?
- [x] If the MR has multiple commits, did you set the MR to squash merge?

See merge request https://code.ornl.gov/futility/Futility/-/merge_requests/429
parent 63a23dbc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1471,7 +1471,7 @@ def runBuildTestCase(inOptions, tribitsGitRepos, buildTestCase, timings):
    if inOptions.useNinja:
      cmakeBaseOptions.append("-GNinja")
    if inOptions.extraCmakeOptions:
      cmakeBaseOptions.extend(commandLineOptionsToList(inOptions.extraCmakeOptions))
      cmakeBaseOptions.extend(inOptions.extraCmakeOptions.split(','))
    cmakeBaseOptions.append(cmakeScopedDefine(projectName,
    "TRIBITS_DIR:PATH", inOptions.tribitsDir))
    cmakeBaseOptions.append(cmakeScopedDefine(projectName,