Remove leftover "|| true" from Travis configuration debugging

.travis.yml

@@ -26,7 +26,7 @@ matrix:
   include:
     - os: linux
       env: MODE=self-test # Ensure that the Makefile works, especially with parallel builds.
-      install: make -j 10 test
+      script: make -j 10 test
       sudo: true
       addons:
         apt:
@@ -54,7 +54,12 @@ matrix:
             - dosbox
     - os: osx
       env: MODE=osx-test # Ensure that the Makefile works. Check that the generated os.bat works in sh mode
-      install: make all test/noemu test/macos
+      before_install:
+        - brew install cdrtools
+        - brew install mtools
+        - brew cask install gdisk
+        - brew install imagemagick # --with-x11
+      script: make all test/noemu test/macos
     - os: linux
       env: MODE=qemu-system-i386-floppy
       sudo: false
@@ -100,27 +105,24 @@ matrix:
             - *common_apt_packages
             - bochs-sdl
 
-before_install:
+install:
-  - brew install cdrtools    || true
+  # TODO: put these in a Makefile target, to share the code with the appveyor configuration
-  - brew install mtools      || true
+  - make --version
-  - brew cask install gdisk  || true
+  - nasm -v
-  - brew install imagemagick || true # --with-x11
+  - mtools --version
-  - make --version           || true
+  - mtools || true
-  - nasm -v                  || true
+  - mkisofs --version
-  - mtools --version         || true
+  - zip --help
-  - mtools                   || true
+  - unzip -h
-  - mkisofs --version        || true
+  - gdisk --version
-  - zip --help               || true
+  - import --version || test "$MODE" = osx-test # import --version has a non-zero exit code on the Travis installation
-  - unzip --version          || true
+  - Xvfb -help
-  - gdisk --version          || true
+  - ssh -V
-  - import --version         || true
-  - Xvfb -h                  || true
-  - ssh -V                   || true
   - ./utils/install-sikulix.sh
   - export PATH="$HOME/sikulix/:$PATH"
   - if test "$MODE" = virtualbox -o "$MODE" = self-test; then ./utils/install-virtualbox.sh; fi
 
-install:
+script:
   - make test/${MODE}
   - |
     ./utils/auto-push.sh "https://github.com/jsmaniac/travis-os.git" \
@@ -130,8 +132,3 @@ install:
                          "edf345aad47e" \
                          "deploy-screenshots" \
                          "$(if test "$TRAVIS_BRANCH" = "master"; then echo master; else echo dev; fi)"
-
-# empty script, we want to have the commands neatly collapsed and Travis does
-# this only for some sections (install and before_install, but not script).
-script:
-  - true