Skip to content

Commit

Permalink
Improve documentation for TRIBITS_CTEST_DRIVER() and other fixes (Tri…
Browse files Browse the repository at this point in the history
…BITSPub#209, TriBITSPub#210)

Things I did other than just extend and improve documentation:

* Improved documentation and handling of
  <Project>_ENABLE_ALL_FORWARD_DEP_PACAKGES

* Removed do-nothing 'BUILD_TYPE'

* Changed CTEST_SITE and TriBITS_HOSTNAME to be the same.  Just more
  consistent looking on CDash.

Build/Test Cases Summary
Enabled Packages:
Enabled all Packages
0) MPI_DEBUG => passed: passed=264,notpassed=0 (0.68 min)
1) SERIAL_RELEASE => passed: passed=264,notpassed=0 (0.66 min)
2) MPI_DEBUG_CMAKE-3.6.2 => passed: passed=285,notpassed=0 (0.75 min)
3) SERIAL_RELEASE_CMAKE-3.6.2 => passed: passed=285,notpassed=0 (0.52 min)
  • Loading branch information
bartlettroscoe committed Nov 27, 2017
1 parent 957d04a commit b6406c6
Show file tree
Hide file tree
Showing 5 changed files with 1,086 additions and 195 deletions.
2 changes: 1 addition & 1 deletion cmake/ctest/travisci/ctest_trusty_serial_debug.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ SET( EXTRA_CONFIGURE_OPTIONS
"-DCMAKE_Fortran_COMPILER=gfortran"
"-DTriBITS_ENABLE_Fortran=ON"
"-DTriBITS_TRACE_ADD_TEST=ON"
"-DTriBITS_HOSTNAME=travis-ci-server-linux"
"-DTriBITS_HOSTNAME=${CTEST_SITE}"
"-DTriBITS_CTestDriver_AAO_ST_PackagesSubset_PASS_DISABLE=ON"
"-DTriBITS_CTestDriver_AAO_ST_SimpleCxx_PASS_DISABLE=ON"
"-DTriBITS_CTestDriver_AAO_ST_ALL_PASS_DISABLE=ON"
Expand Down
24 changes: 24 additions & 0 deletions test/ctest_driver/MockCTestDriver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,30 @@ CREATE_CTEST_DEPENDENCY_HANDLING_TEST_CASE(
# different package configures to make sure everything in there.


CREATE_CTEST_DEPENDENCY_HANDLING_TEST_CASE(
EnableThyra_EnableAllForwardDepPackages
ARGS Trilinos_PACKAGES=Thyra Trilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES=TRUE
Trilinos_ENABLE_KNOWN_EXTERNAL_REPOS_TYPE=Experimental
CTEST_EXPLICITLY_ENABLE_IMPLICITLY_ENABLED_PACKAGES=FALSE
PASS_REGULAR_EXPRESSION_ALL
"-- ENV_Trilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES='TRUE'"
"-- Trilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES='TRUE'"
"Explicitly enabled SE packages on input [(]by user[)]: Thyra 1"
"Sweep forward enabling all forward library dependent packages because Trilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES=ON"
"-- Setting Trilinos_ENABLE_Stratimikos=ON because Trilinos_ENABLE_ThyraCoreLibs=ON"
"Final set of enabled packages: Teuchos RTOp Epetra Zoltan Triutils Tpetra EpetraExt Thyra Isorropia AztecOO Galeri Amesos Ifpack ML Stratimikos 15"
"Final set of enabled SE packages: Teuchos RTOp Epetra Zoltan Triutils Tpetra EpetraExt ThyraCoreLibs ThyraEpetra ThyraEpetraExt ThyraTpetra Thyra Isorropia AztecOO Galeri Amesos Ifpack ML Stratimikos 19"
"Final set of packages to be explicitly processed by CTest/CDash: Thyra Stratimikos 2"
"Processing current package Thyra: libs='ON', tests='ON'"
"CONFIGURE_OPTIONS = '.*-DTrilinos_ENABLE_Thyra:BOOL=ON'"
"Processing current package Stratimikos: libs='ON', tests='ON'"
"CONFIGURE_OPTIONS = '.*-DTrilinos_ENABLE_Stratimikos:BOOL=ON'"
)
# NOTE: The above test makes sure that
# Trilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES is read from the env and has the
# intended impact.


CREATE_CTEST_DEPENDENCY_HANDLING_TEST_CASE(
EnableEpetraThyra_NoProcessImplicitlyEnabled
ARGS Trilinos_PACKAGES=Epetra,Thyra
Expand Down
Loading

0 comments on commit b6406c6

Please sign in to comment.