From d08593e8d678f41cf80dd690828e9585e05c4ad6 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Thu, 13 Sep 2018 12:18:42 -0500
Subject: [PATCH] Only run unit tests on 7.2 (#9201)

* Only run unit tests on 7.2
Move style check to 7.1

* stop build when a script fails
---
 .travis.yml            | 9 ++++++---
 scripts/pre-commit.php | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9ab9679327..5afbe7c7c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,13 @@ matrix:
   fast_finish: true
   include:
   - php: 7.2
+    env: SKIP_STYLE_CHECK=1
   - php: 7.1
-    env: SKIP_STYLE_CHECK=1
+    env: SKIP_UNIT_CHECK=1
   - php: 7.0
-    env: SKIP_STYLE_CHECK=1
+    env: SKIP_STYLE_CHECK=1 SKIP_UNIT_CHECK=1
   - php: 5.6
-    env: SKIP_STYLE_CHECK=1 EXECUTE_BUILD_DOCS=true
+    env: SKIP_STYLE_CHECK=1 SKIP_UNIT_CHECK=1 EXECUTE_BUILD_DOCS=true
 #  - php: hhvm
 #    env: SKIP_STYLE_CHECK=1
 
@@ -38,9 +39,11 @@ after_failure:
   - tail /tmp/snmpsimd.log
 
 script:
+  - set -e
   - php scripts/pre-commit.php -q -l
   - php scripts/pre-commit.php -q -s
   - php scripts/pre-commit.php -u --db --snmpsim --fail-fast
   - bash -n daily.sh
   - pylint -E poller-wrapper.py discovery-wrapper.py
   - bash scripts/deploy-docs.sh
+  - set +e
diff --git a/scripts/pre-commit.php b/scripts/pre-commit.php
index 77d872f1fc..01f3f3cf37 100755
--- a/scripts/pre-commit.php
+++ b/scripts/pre-commit.php
@@ -119,7 +119,7 @@ function run_check($type, $passthru, $command_only, $options = array())
 {
     global $completed_tests;
     if (getenv('SKIP_' . strtoupper($type) . '_CHECK') || $completed_tests[$type]) {
-        echo ucfirst($type) . ' check skipped.';
+        echo ucfirst($type) . " check skipped.\n";
         return 0;
     }