File tree Expand file tree Collapse file tree 2 files changed +19
-6
lines changed Expand file tree Collapse file tree 2 files changed +19
-6
lines changed Original file line number Diff line number Diff line change @@ -23,12 +23,25 @@ trap '__caf_err_report "${FUNCNAME:-.}" ${LINENO}' ERR
23
23
echo " Performing Travis-CI script phase for the OpenCoarrays installation script..."
24
24
25
25
./install.sh --yes-to-all -i " ${HOME} /opencoarrays" -j 4 -f " $( type -P " ${FC} " ) " -c " $( type -P " ${CC} " ) " -C " $( type -P " ${CXX} " ) "
26
- CTEST_LOC=(prerequisites/installations/cmake/* /bin/ctest)
27
- INSTALLER_CTEST=" ${CTEST_LOC[${#CTEST_LOC[@]} -1]}"
28
- if [[ -x " ${INSTALLER_CTEST} " ]] ; then
29
- " ${INSTALLER_CTEST} " --output-on-failure --schedule-random --repeat-until-fail " ${NREPEAT:- 5} "
26
+ BUILD_LOC=(prerequisites/builds/opencoarrays/* /)
27
+ BUILD_LOC_DIR=" ${BUILD_LOC[${#BUILD_LOC[@]} ]-1}"
28
+ if [[ -d " ${BUILD_LOC_DIR} " ]]; then
29
+ echo " Found opencoarrays build directory created by the install script:"
30
+ echo " ${BUILD_LOC_DIR} "
31
+ (
32
+ cd " ${BUILD_LOC} "
33
+ CTEST_LOC=(../../../installations/cmake/* /bin/ctest)
34
+ INSTALLER_CTEST=" ${CTEST_LOC[${#CTEST_LOC[@]} -1]}"
35
+ if [[ -x " ${INSTALLER_CTEST} " ]] ; then
36
+ " ${INSTALLER_CTEST} " --output-on-failure --schedule-random --repeat-until-fail " ${NREPEAT:- 5} "
37
+ else
38
+ ctest --output-on-failure --schedule-random --repeat-until-fail " ${NREPEAT:- 5} "
39
+ fi
40
+ )
30
41
else
31
- ctest --output-on-failure --schedule-random --repeat-until-fail " ${NREPEAT:- 5} "
42
+ echo " Failed to find install.sh build directory. Contents of prerequisites/builds is:"
43
+ ls prerequisites/builds/* /
44
+ exit 5
32
45
fi
33
46
34
47
echo " Done."
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ trap '__caf_err_report "${FUNCNAME:-.}" ${LINENO}' ERR
22
22
23
23
echo " Performing Travis-CI script phase for the OpenCoarrays direct cmake build..."
24
24
25
- mkdir cmake-build || echo " Cannot mkdir cmake-build "
25
+ mkdir cmake-build
26
26
# shellcheck disable=SC2153
27
27
for BUILD_TYPE in ${BUILD_TYPES} ; do
28
28
rm -rf cmake-build/* || true
You can’t perform that action at this time.
0 commit comments