Skip to content

Commit 725a617

Browse files
committed
Fix failing Linux install script travis build
Travis seems to have updated default CMake on Linux, causing the linux test of the install.sh script to no longer install CMake. As a result the testing script was failing because it was looking for ctest in the wrong spot.
1 parent 244c628 commit 725a617

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed

developer-scripts/travis/install.linux.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,14 @@ if [[ "${BUILD_TYPE:-}" != InstallScript ]]; then # Ubuntu on Travis-CI, NOT tes
3535
make install
3636
)
3737
fi
38-
mpif90 --version
39-
mpicc --version
40-
cmake --version
4138
fi
4239

40+
{
41+
mpif90 --version && mpif90 -show
42+
} || true
43+
{
44+
mpicc --version && mpicc -show
45+
} || true
46+
cmake --version || true
47+
4348
echo "Done."

developer-scripts/travis/install.osx.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,13 @@ else
4040
brew install --force-bottle "${MPICH_BOT_URL_TAIL}"
4141
brew ls --versions mpich >/dev/null || brew install --force-bottle mpich
4242
fi
43-
mpif90 --version || mpif90 -show || true
44-
mpicc --version || mpicc -show || true
43+
44+
{
45+
mpif90 --version && mpif90 -show
46+
} || true
47+
{
48+
mpicc --version && mpicc -show
49+
} || true
4550
cmake --version || true
4651

4752
echo "Done."

developer-scripts/travis/test-script.InstallScript.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ trap '__caf_err_report "${FUNCNAME:-.}" ${LINENO}' ERR
2323
echo "Performing Travis-CI script phase for the OpenCoarrays installation script..."
2424

2525
./install.sh --yes-to-all -i "${HOME}/opencoarrays" -j 4 -f "$(type -P "${FC}")" -c "$(type -P "${CC}")" -C "$(type -P "${CXX}")"
26-
(
27-
cd prerequisites/builds/opencoarrays/*
28-
"../../../installations/cmake/*/bin/ctest" --output-on-failure --schedule-random --repeat-until-fail "${NREPEAT:-5}"
29-
)
26+
if [[ -x "prerequisites/installations/cmake/*/bin/ctest" ]] ;then
27+
"prerequisites/installations/cmake/*/bin/ctest" --output-on-failure --schedule-random --repeat-until-fail "${NREPEAT:-5}"
28+
else
29+
ctest --output-on-failure --schedule-random --repeat-until-fail "${NREPEAT:-5}"
30+
fi
3031

3132
echo "Done."

0 commit comments

Comments
 (0)