Skip to content

Commit 40d6090

Browse files
author
Roscoe A. Bartlett
committed
Add checkin-test-fissile4.sh and make do-configure scripts more generic
Now that the default version of CMake for the CASL VERA Dev Env has been updated from CMake 2.8.11 to 3.4.0, we need to test TriBITS against CMake 2.8.11 to ensure that it stays compatible with that version. However, for local development, I want to test against the VERA Dev Env version of TriBITS as well (i.e. CMake 3.4.0). The solution that I have come up with is to create a new checkin-test-fissile4.sh script that will use CMake 2.8.11 when it does the configures and builds. That will make sure that I don't break backward compatiblity with CMake 2.8.11 when pushing. I also make the existing do-configure-xxx scripts more generic by having them find the TriBITS repo they are in by following the symlink. Now I will only need a single version of these do-configure scripts for all platforms.
1 parent e521db3 commit 40d6090

6 files changed

Lines changed: 158 additions & 68 deletions

File tree

dev_testing/Trilinos/do-configure-mpi-debug

Lines changed: 0 additions & 34 deletions
This file was deleted.

dev_testing/Trilinos/do-configure-serial-debug

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
#!/bin/bash
2+
3+
# Used to test TriBITS on any of the ORNL CASL Fissile/Spy machines
4+
#
5+
# This script requires that the VERA dev env be loaded by sourcing the script:
6+
#
7+
# . /projects/vera/gcc-4.8.3/load_dev_env.[sh,csh]
8+
#
9+
# You can source this script either in your shell startup script
10+
# (e.g. .bash_profile) or you can source it manually whenever you need to set
11+
# up to build VERA software.
12+
#
13+
# You can link this script into any location and it will work out of the box.
14+
15+
EXTRA_ARGS=$@
16+
17+
if [ "$TRIBITS_BASE_DIR" == "" ] ; then
18+
_ABS_FILE_PATH=`readlink -f $0`
19+
_SCRIPT_DIR=`dirname $_ABS_FILE_PATH`
20+
TRIBITS_BASE_DIR=$_SCRIPT_DIR/../..
21+
fi
22+
23+
TRIBITS_BASE_DIR_ABS=$(readlink -f $TRIBITS_BASE_DIR)
24+
echo "TRIBITS_BASE_DIR_ABS = $TRIBITS_BASE_DIR_ABS"
25+
26+
# Check to make sure that the env has been loaded correctly
27+
if [ "$LOADED_TRIBITS_DEV_ENV" != "gcc-4.8.3" ] ; then
28+
echo "Error, must source /projects/vera/gcc-4.8.3/load_dev_env.[sh,csh] before running checkin-test-vera.sh!"
29+
exit 1
30+
fi
31+
32+
#
33+
# Built-in Primary Tested (PT) --default-builds (DO NOT MODIFY)
34+
#
35+
36+
echo "
37+
-DTrilinos_CONFIGURE_OPTIONS_FILE:FILEPATH='$TRIBITS_BASE_DIR_ABS/dev_testing/generic/do-configure-mpi-debug'
38+
" > MPI_DEBUG.config
39+
40+
echo "
41+
-DTrilinos_CONFIGURE_OPTIONS_FILE:FILEPATH='$TRIBITS_BASE_DIR_ABS/dev_testing/generic/do-configure-serial-release-gcc'
42+
" > SERIAL_RELEASE.config
43+
44+
#
45+
# Invocation
46+
#
47+
48+
# Use CMake 2.8.11 to test since that is the min version we are enforcing!
49+
export PATH=/projects/vera/common_tools/cmake-2.8.11/bin:$PATH
50+
51+
$TRIBITS_BASE_DIR_ABS/checkin-test.py \
52+
-j16 \
53+
--ctest-timeout=180 \
54+
--skip-case-no-email \
55+
$EXTRA_ARGS
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/bash
2+
3+
EXTRA_ARGS=$@
4+
5+
#
6+
# Configure script for an MPI DEBUG build of the TriBITS project & package.
7+
#
8+
# This script will work in any platform where the MPI compiler wrappers are in
9+
# the default path.
10+
#
11+
# This script must be symbolically linked in for it to find the path back to
12+
# the local TriBITS repo.
13+
#
14+
15+
if [ "$TRIBITS_BASE_DIR" == "" ] ; then
16+
_ABS_FILE_PATH=`readlink -f $0`
17+
_SCRIPT_DIR=`dirname $_ABS_FILE_PATH`
18+
TRIBITS_BASE_DIR=$_SCRIPT_DIR/../..
19+
fi
20+
21+
TRIBITS_BASE_DIR_ABS=$(readlink -f $TRIBITS_BASE_DIR)
22+
echo "TRIBITS_BASE_DIR_ABS = $TRIBITS_BASE_DIR_ABS"
23+
24+
cmake \
25+
-D CMAKE_BUILD_TYPE:STRING="DEBUG" \
26+
-D TPL_ENABLE_MPI:BOOL=ON \
27+
-D TriBITS_ENABLE_Fortran:BOOL=ON \
28+
-D TriBITS_ENABLE_TESTS:BOOL=ON \
29+
-D TriBITS_ENABLE_CONFIGURE_TIMING:BOOL=ON \
30+
$EXTRA_ARGS \
31+
${TRIBITS_BASE_DIR_ABS}
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/bin/bash
2+
3+
EXTRA_ARGS=$@
4+
5+
#
6+
# Configure script for a SERIAL DEBUG build with GCC compilers of the TriBITS
7+
# project & package.
8+
#
9+
# This script will work in any platform where the gcc compilers are found by
10+
# default.
11+
#
12+
# This script must be symbolically linked in for it to find the path back to
13+
# the local TriBITS repo.
14+
#
15+
16+
if [ "$TRIBITS_BASE_DIR" == "" ] ; then
17+
_ABS_FILE_PATH=`readlink -f $0`
18+
_SCRIPT_DIR=`dirname $_ABS_FILE_PATH`
19+
TRIBITS_BASE_DIR=$_SCRIPT_DIR/../..
20+
fi
21+
22+
TRIBITS_BASE_DIR_ABS=$(readlink -f $TRIBITS_BASE_DIR)
23+
echo "TRIBITS_BASE_DIR_ABS = $TRIBITS_BASE_DIR_ABS"
24+
25+
cmake \
26+
-D CMAKE_BUILD_TYPE="DEBUG" \
27+
-D TPL_ENABLE_MPI=OFF \
28+
-D CMAKE_C_COMPILER=gcc \
29+
-D TriBITS_ENABLE_Fortran=ON \
30+
-D TriBITS_ENABLE_TESTS=ON \
31+
-D TriBITS_ENABLE_CONFIGURE_TIMING=ON \
32+
$EXTRA_ARGS \
33+
${TRIBITS_BASE_DIR_ABS}
34+
35+
# NOTE: Above we must set CMAKE_C_COMPILER=gcc or CMake will find cc by
36+
# default and then it will not find Fortran.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/bin/bash
2+
3+
EXTRA_ARGS=$@
4+
5+
#
6+
# Configure script for a SERIAL DEBUG build with GCC compilers of the TriBITS
7+
# project & package.
8+
#
9+
# This script will work in any platform where the gcc compilers are found by
10+
# default.
11+
#
12+
# This script must be symbolically linked in for it to find the path back to
13+
# the local TriBITS repo.
14+
#
15+
16+
if [ "$TRIBITS_BASE_DIR" == "" ] ; then
17+
_ABS_FILE_PATH=`readlink -f $0`
18+
_SCRIPT_DIR=`dirname $_ABS_FILE_PATH`
19+
TRIBITS_BASE_DIR=$_SCRIPT_DIR/../..
20+
fi
21+
22+
TRIBITS_BASE_DIR_ABS=$(readlink -f $TRIBITS_BASE_DIR)
23+
echo "TRIBITS_BASE_DIR_ABS = $TRIBITS_BASE_DIR_ABS"
24+
25+
cmake \
26+
-D CMAKE_BUILD_TYPE="DEBUG" \
27+
-D TPL_ENABLE_MPI=OFF \
28+
-D CMAKE_C_COMPILER=gcc \
29+
-D TriBITS_ENABLE_Fortran=ON \
30+
-D TriBITS_ENABLE_TESTS=ON \
31+
-D TriBITS_ENABLE_CONFIGURE_TIMING=ON \
32+
$EXTRA_ARGS \
33+
${TRIBITS_BASE_DIR_ABS}
34+
35+
# NOTE: Above we must set CMAKE_C_COMPILER=gcc or CMake will find cc by
36+
# default and then it will not find Fortran.

0 commit comments

Comments
 (0)