Revert "Debug commit"

This reverts commit 6886d03.

Author: matthew-brett

.travis.yml

@@ -4,36 +4,35 @@ language:
 env:
   matrix:
     - INSTALL_TYPE='macpython' VERSION=2.7.17
-#   - INSTALL_TYPE='macpython' VERSION=2.7
-#   - INSTALL_TYPE='macpython' VERSION=2.7.12 VENV=venv
-#   - INSTALL_TYPE='macpython' VERSION=3.5
-#   - INSTALL_TYPE='macpython' VERSION=3.5.2 VENV=venv
-#   - INSTALL_TYPE='macpython' VERSION=3.6.1 VENV=venv
-#   - INSTALL_TYPE='macpython' VERSION=3.7 VENV=venv
-#   - INSTALL_TYPE='macpython' VERSION=3.8 VENV=venv
-#   - INSTALL_TYPE='macports' VERSION=2.7
-#   - INSTALL_TYPE='macports' VERSION=2.7 VENV=venv
-#   - INSTALL_TYPE='macports' VERSION=3.6
-#   - INSTALL_TYPE='macports' VERSION=3.6 VENV=venv
-#   - INSTALL_TYPE='macports' VERSION=3.7
-#   - INSTALL_TYPE='macports' VERSION=3.7 VENV=venv
-#   - INSTALL_TYPE='macports' VERSION=3.8
-#   - INSTALL_TYPE='macports' VERSION=3.8 VENV=venv
-#   - INSTALL_TYPE='homebrew' VERSION=2
-#   - INSTALL_TYPE='homebrew' VERSION=2 VENV=venv
-#   - INSTALL_TYPE='homebrew' VERSION=3
-#   - INSTALL_TYPE='homebrew' VERSION=3 VENV=venv
-#   # Versions for system are placeholders (and for testing)
-#   # Non-venv can't work for system installs now - no permissions to install
-#   # into system drectories, even with sudo.
-#   - INSTALL_TYPE='system' VERSION=2.7 VENV=venv
+    - INSTALL_TYPE='macpython' VERSION=2.7
+    - INSTALL_TYPE='macpython' VERSION=2.7.12 VENV=venv
+    - INSTALL_TYPE='macpython' VERSION=3.5
+    - INSTALL_TYPE='macpython' VERSION=3.5.2 VENV=venv
+    - INSTALL_TYPE='macpython' VERSION=3.6.1 VENV=venv
+    - INSTALL_TYPE='macpython' VERSION=3.7 VENV=venv
+    - INSTALL_TYPE='macpython' VERSION=3.8 VENV=venv
+    - INSTALL_TYPE='macports' VERSION=2.7
+    - INSTALL_TYPE='macports' VERSION=2.7 VENV=venv
+    - INSTALL_TYPE='macports' VERSION=3.6
+    - INSTALL_TYPE='macports' VERSION=3.6 VENV=venv
+    - INSTALL_TYPE='macports' VERSION=3.7
+    - INSTALL_TYPE='macports' VERSION=3.7 VENV=venv
+    - INSTALL_TYPE='macports' VERSION=3.8
+    - INSTALL_TYPE='macports' VERSION=3.8 VENV=venv
+    - INSTALL_TYPE='homebrew' VERSION=2
+    - INSTALL_TYPE='homebrew' VERSION=2 VENV=venv
+    - INSTALL_TYPE='homebrew' VERSION=3
+    - INSTALL_TYPE='homebrew' VERSION=3 VENV=venv
+    # Versions for system are placeholders (and for testing)
+    # Non-venv can't work for system installs now - no permissions to install
+    # into system drectories, even with sudo.
+    - INSTALL_TYPE='system' VERSION=2.7 VENV=venv
 
 install:
   - source ./travis_tools.sh
   - get_python_environment $INSTALL_TYPE $VERSION $VENV
 
 script:
-  - set -v
   - source test_tools.sh
   - $PIP_CMD install pytest
   - pytest test_travisparse.py

test_tools.sh

@@ -4,13 +4,9 @@ RET=0
 # Allow errors during tests
 set +e
 source test_python_installs.sh
-echo "RET is $RET"
 source test_pyver_ge.sh
-echo "RET is $RET"
 source test_git_utils.sh
-echo "RET is $RET"
 source test_library_installers.sh
-echo "RET is $RET"
 source test_osx_versions.sh
 # Set the final return code
 (exit $RET)