Skip to content

Commit

Permalink
Framework: Enable extended options in parameterized tests (#3555)
Browse files Browse the repository at this point in the history
@trilinos/framework 	

@jwillenbring 	
@prwolfe 	

This is an update to the script for the Tpetra request to enable COMPLEX_DOUBLE in at least one of the nightly tests, with movement up to Clean testing once the kinks are sorted out.  That requires the modifications to go into the parameterized tests.

This modification enables us to set two additional parameters in Jenkins:
- `JENKINS_Trilinos_EXTRA_CONFIGURE_OPTIONS` - Takes a string in the form "-DTrilinos_ENABLE_..." "-DTrilinos_ENABLE_..." and inserts this into the `EXTRA_CONFIGURE_OPTIONS` in the testing.
- `JENKINS_BUILD_TAG` - A string that will get appended to the testing label in CDash.  
  - If this is empty, then nothing gets added.  
  - If it's not empty, then "_${JENKINS_BUILD_TAG}" will get appended to the test label in CDash.
  - Note: Leading underscores in the value of this will get removed so there is always only 1 leading underscore.

This update fixes a bug with the previous attempt which didn't take into account the way we launch these jobs in Jenkins.  

@jwillenbring
@prwolfe 
You can review it and approve if you get a chance, but I have a test running currently and want it to finish before merging to make sure it does the right thing.
- [CDash output from test][1]
- [Jenkins Job][2]

[1]: https://testing.sandia.gov/cdash/index.php?project=Trilinos&parentid=4000539
[2]: https://ascic-jenkins.sandia.gov/job/trilinos-folder/job/Trilinos_generic_nightly_test_wcmclen/20/
  • Loading branch information
william76 authored Oct 4, 2018
1 parent caeb672 commit fa64cab
Showing 1 changed file with 14 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,22 @@ IF(JENKINS_EXTRA_CONFIGURE_OPTIONS)
# Strip leading and trailing whitespace
STRING(STRIP "${JENKINS_EXTRA_CONFIGURE_OPTIONS}" JENKINS_EXTRA_CONFIGURE_OPTIONS)

# There should just be one leading and trailing '"' character, if Jenkins added
# extras, the this will strip them off.
STRING(REGEX REPLACE "^\"+" "\"" JENKINS_EXTRA_CONFIGURE_OPTIONS ${JENKINS_EXTRA_CONFIGURE_OPTIONS})
STRING(REGEX REPLACE "\"+$" "\"" JENKINS_EXTRA_CONFIGURE_OPTIONS ${JENKINS_EXTRA_CONFIGURE_OPTIONS})
# There should just be one leading and trailing '"' character,
# But when JENKINS_EXTRA_CONFIGURE_OPTIONS is added to EXTRA_CONFIGURE_OPTIONS
# CMake is adding in an extra quotation by the time this gets to the command line.
# So let's strip off the leading and trailing quotation from the string itself.
STRING(REGEX REPLACE "^\"+" "" JENKINS_EXTRA_CONFIGURE_OPTIONS ${JENKINS_EXTRA_CONFIGURE_OPTIONS})
STRING(REGEX REPLACE "\"+$" "" JENKINS_EXTRA_CONFIGURE_OPTIONS ${JENKINS_EXTRA_CONFIGURE_OPTIONS})
ENDIF()

# Debugging Messages
# MESSAGE("")
# MESSAGE("---")
# MESSAGE("--- ENV:JENKINS_EXTRA_CONFIGURE_OPTIONS: '$ENV{JENKINS_Trilinos_EXTRA_CONFIGURE_OPTIONS}'")
# MESSAGE("--- JENKINS_EXTRA_CONFIGURE_OPTIONS....: '${JENKINS_EXTRA_CONFIGURE_OPTIONS}'")
# MESSAGE("--- BUILD_TAG..........................: '${BUILD_TAG}'")
# MESSAGE("---")

# Set the build name of the job (this is reported to CDash as the job name)
SET(BUILD_DIR_NAME ${COMM_TYPE}_${BUILD_TYPE}_${COMPILER_DIR}_${COMM_DIR}${BUILD_TAG}_DEV)

Expand Down

0 comments on commit fa64cab

Please sign in to comment.