2 Commits

Author SHA1 Message Date
Michael Davidsaver
a34bb7d2b2 travis: always show test-results
even if one of the tests crashes
2020-04-08 14:52:06 +02:00
Ralph Lange
94fdfbe802 travis: fix MSI patch file location 2020-04-08 14:50:06 +02:00
2 changed files with 7 additions and 2 deletions

View File

@@ -15,8 +15,13 @@ export EPICS_HOST_ARCH
make -j2 $EXTRA make -j2 $EXTRA
ret=0
if [ "$TEST" != "NO" ] if [ "$TEST" != "NO" ]
then then
make tapfiles make tapfiles || ret=$?
make -s test-results make -s test-results
fi fi
exit $ret

View File

@@ -185,7 +185,7 @@ add_dependency() {
if [ -e ${versionfile} ] && grep -q "BASE_3_14=YES" ${versionfile} if [ -e ${versionfile} ] && grep -q "BASE_3_14=YES" ${versionfile}
then then
echo "Adding MSI 1.7 to $CACHEDIR/$dirname-$TAG" echo "Adding MSI 1.7 to $CACHEDIR/$dirname-$TAG"
( cd $dirname-$TAG; patch -p0 < $curdir/add-msi-to-314.patch ) ( cd $dirname-$TAG; patch -p0 < $SCRIPTDIR/../add-msi-to-314.patch )
fi fi
else else
# fix non-base modules that do not include the .local files in configure/RELEASE # fix non-base modules that do not include the .local files in configure/RELEASE