File tree Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -29,11 +29,13 @@ for version in ${GCC}; do
29
29
if [[ ${OSTYPE} == [Dd]arwin* ]]; then
30
30
# Use clang on macOS because that's what homebrew and everyone else does
31
31
export CC=clang
32
+ brew unlink openmpi || true
33
+ brew unlink mpich || true
32
34
for mpi in " mpich" " open-mpi" ; do
33
35
brew unlink " ${mpi} " || true
34
36
brew ls --versions " ${mpi} " > /dev/null || brew install " ${mpi} "
35
37
brew outdated " ${mpi} " || brew upgrade " ${mpi} "
36
- brew unlink " ${mpi} "
38
+ brew unlink " ${mpi} " || true
37
39
done
38
40
brew link open-mpi
39
41
fi
@@ -50,7 +52,12 @@ for version in ${GCC}; do
50
52
cd " ${BLD_DIR} "
51
53
cmake -DCMAKE_INSTALL_PREFIX:PATH=" ${HOME} /OpenCoarrays" -DCMAKE_BUILD_TYPE=" ${BUILD_TYPE} " ..
52
54
make -j 4
53
- ctest --output-on-failure --schedule-random --repeat-until-fail " ${NREPEAT:- 5} " --timeout " ${TEST_TIMEOUT:- 200} "
55
+ CTEST_FLAGS=(--output-on-failure --schedule-random --repeat-until-fail " ${NREPEAT:- 5} " --timeout " ${TEST_TIMEOUT:- 200} " )
56
+ if [[ " ${BUILD_TYPE} " =~ Deb ]]; then
57
+ ctest " ${CTEST_FLAGS[@]} " > " ${BUILD_TYPE} .log" || cat " ${BUILD_TYPE} .log"
58
+ else
59
+ ctest " ${CTEST_FLAGS[@]} "
60
+ fi
54
61
make install
55
62
make uninstall
56
63
)
You can’t perform that action at this time.
0 commit comments