From a4c786532f3dccf5c203c0fed0eb622162c8efc3 Mon Sep 17 00:00:00 2001
From: zosrothko <zosrothko@orange.fr>
Date: Wed, 20 Jul 2016 11:25:47 +0200
Subject: [PATCH 1/3] Using installed CMake

---
 appveyor.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 7e2b6d48c..5abc07252 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -128,11 +128,11 @@ install:
         } else {
             choco install jom
         }
-        if (Test-Path "$env:ChocolateyInstall\bin\cmake.exe") {
-          echo "using cmake from cache"
-        } else {
-          choco install cmake
-        }
+#        if (Test-Path "$env:ChocolateyInstall\bin\cmake.exe") {
+#          echo "using cmake from cache"
+#        } else {
+#          choco install cmake
+#        }
       }
   - set
 

From 9cf03cc6845ef06e28e83dc6de9db89262878977 Mon Sep 17 00:00:00 2001
From: zosrothko <zosrothko@orange.fr>
Date: Wed, 20 Jul 2016 11:28:20 +0200
Subject: [PATCH 2/3] YAML does not like embedded comment in PS script.

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5abc07252..37627b96a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -128,12 +128,12 @@ install:
         } else {
             choco install jom
         }
+      }
 #        if (Test-Path "$env:ChocolateyInstall\bin\cmake.exe") {
 #          echo "using cmake from cache"
 #        } else {
 #          choco install cmake
 #        }
-      }
   - set
 
 # -------------------------------------------------------------------------------------------

From 33208a6ee81feaddf8b50b0e288ece87889fa3ce Mon Sep 17 00:00:00 2001
From: zosrothko <zosrothko@orange.fr>
Date: Wed, 20 Jul 2016 11:36:57 +0200
Subject: [PATCH 3/3] Run tests only if compile/link/install are ok.

---
 .travis.yml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd7059bef..847f6a9f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,24 +61,21 @@ matrix:
         - export CC="clang"
         - export CXX="clang++"
         - clang++ -x c++ /dev/null -dM -E
-        - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL && make -s -j2 && sudo make install
-        - ./travis/OSX/runtests.sh
+        - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL && make -s -j2 && sudo make install && ./travis/OSX/runtests.sh
 
     - env:    TEST_NAME="Linux gcc 4.6 (make) bundled"
       compiler: gcc
       script:
         - export CC="gcc"
         - export CXX="g++"
-        - ./configure --everything && make -s -j2 
-        - ./travis/Linux/runtests.sh
+        - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh
     
     - env:    TEST_NAME="Linux gcc 4.8 (make) bundled"
       compiler: gcc
       script:
         - export CC="gcc-4.8"
         - export CXX="g++-4.8"
-        - ./configure --everything && make -s -j2
-        - ./travis/Linux/runtests.sh
+        - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh
     
     - env:    TEST_NAME="Linux gcc 4.6 (make) unbundled"
       compiler: gcc
@@ -86,8 +83,7 @@ matrix:
         - export CC="gcc"
         - export CXX="g++"
         - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev
-        - ./configure --everything --unbundled && make -s -j2
-        - ./travis/Linux/runtests.sh
+        - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh
 
     - env:    TEST_NAME="Linux gcc 4.8 (make) unbundled"
       compiler: gcc
@@ -95,14 +91,12 @@ matrix:
         - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev
         - export CC="gcc-4.8"
         - export CXX="g++-4.8"
-        - ./configure --everything --unbundled && make -s -j2
-        - ./travis/Linux/runtests.sh
+        - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh
     
     - env:    TEST_NAME="Linux clang 3.4 (make)"
       compiler: clang
       script:
-        - ./configure --everything --config=Linux-clang && make -s -j2
-        - ./travis/Linux/runtests.sh
+        - ./configure --everything --config=Linux-clang && make -s -j2 && ./travis/Linux/runtests.sh
 
     - env:    TEST_NAME="Linux arm-linux-gnueabi- (make)"
       compiler: gcc