travis: always show test-results

even if one of the tests crashes
travis: fix MSI patch file location
2020-04-08 14:52:06 +02:00 · 2020-04-08 14:50:06 +02:00
2 changed files with 7 additions and 2 deletions
--- a/travis/build.sh
+++ b/travis/build.sh
@@ -15,8 +15,13 @@ export EPICS_HOST_ARCH

 make -j2 $EXTRA

+ret=0
+
 if [ "$TEST" != "NO" ]
 then
-  make tapfiles
+  make tapfiles || ret=$?
+
  make -s test-results
 fi
+
+exit $ret
--- a/travis/utils.sh
+++ b/travis/utils.sh
@@ -185,7 +185,7 @@ add_dependency() {
      if [ -e ${versionfile} ] && grep -q "BASE_3_14=YES" ${versionfile}
      then
        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
    else
    # fix non-base modules that do not include the .local files in configure/RELEASE
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