Skip to content

Commit

Permalink
Switch post-push CI biuld to updated GCC 4.8.4 + OpenMP config and Ni…
Browse files Browse the repository at this point in the history
…nja (trilinos#2462)

Now that this build is clean, we need to keep it clean.
  • Loading branch information
bartlettroscoe committed May 30, 2018
1 parent f6cd09d commit 4f9e61e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,12 @@ INCLUDE("${CTEST_SCRIPT_DIRECTORY}/TrilinosCTestDriverCore.sems.cmake")
# Set the options specific to this build case
#

SET(BUILD_DIR_NAME MPI_RELEASE_DEBUG_SHARED_PT_CI)
SET(BUILD_DIR_NAME MPI_RELEASE_DEBUG_SHARED_PT_OPENMP_CI)
#SET(CTEST_TEST_TIMEOUT 900)

#override the default number of processors to run on.
SET( CTEST_BUILD_FLAGS "-j16 -i" )
#override the default number of processors to run on and use Ninja
SET( CTEST_CMAKE_GENERATOR Ninja )
SET( CTEST_BUILD_FLAGS "-j16 -k 999999" )
SET( CTEST_PARALLEL_LEVEL "16" )

SET(Trilinos_ENABLE_SECONDARY_TESTED_CODE OFF)
Expand All @@ -76,13 +77,13 @@ SET(Trilinos_BRANCH develop)
SET(EXTRA_EXCLUDE_PACKAGES)

SET( EXTRA_CONFIGURE_OPTIONS
"-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/MpiReleaseDebugSharedPtSerial.cmake"
"-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/GCC-4.8.4-OpenMPI-1.10.1-MpiReleaseDebugSharedPtOpenMP.cmake"
"-DTrilinos_TEST_CATEGORIES=BASIC"
"-DTrilinos_ENABLE_CONFIGURE_TIMING=ON"
)
# NOTE: That above must match *exactly* what is listed is listed in
# project-checkin-test-config.py and produced by the checkin-test-sems.sh
# --default-builds=MPI_RELEASE_DEBUG_SHARED_PT build!
# --default-builds=MPI_RELEASE_DEBUG_SHARED_PT_OPENMP build!

SET(CTEST_TEST_TYPE Continuous)

Expand Down
4 changes: 2 additions & 2 deletions cmake/ctest/drivers/sems_ci/single_ci_iter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ TRILINOS_DIR=`readlink -f ${DRIVER_SCRIPT_DIR}/../../../..`
echo "TRILINOS_DIR='${TRILINOS_DIR}'"

source /etc/bashrc
TRILINOS_SEMS_DEV_ENV_VERBOSE=1
source $TRILINOS_DIR/cmake/load_sems_dev_env.sh
source $TRILINOS_DIR/cmake/std/GCC-4.8.4-OpenMPI-1.10.1-MpiReleaseDebugSharedPtOpenMP_env.sh
module list

export CTEST_DASHBOARD_ROOT=$PWD

Expand Down

0 comments on commit 4f9e61e

Please sign in to comment.