From ade93a30f801f33ea907daa52dee3a31502f7968 Mon Sep 17 00:00:00 2001
From: zosrothko <zosrothko@orange.fr>
Date: Mon, 17 Apr 2017 20:14:27 +0200
Subject: [PATCH] Test the new distribution feature of Travis

---
 .travis.yml | 51 +++++++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 34f4759b6..393358a86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,9 @@ services:
   - postgresql
   - mysql
 
+dist: trusty
+sudo: required
+  
 addons:
   postgresql: "9.3"
 
@@ -74,14 +77,14 @@ matrix:
         - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev
         - ./configure --everything  && make -s -j2 && ./travis/Linux/runtests.sh
     
-    #- env:    TEST_NAME="clang (make) unbundled"
-    #  compiler: clang
-    #  script:
-    #    - sudo apt-get install -qq -y clang
-    #    - export CC="clang"
-    #    - export CXX="clang++"
-    #    - $CXX --version
-    #    - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh
+    - env:    TEST_NAME="clang (make) unbundled"
+      compiler: clang
+      script:
+        - sudo apt-get install -qq -y clang
+        - export CC="clang"
+        - export CXX="clang++"
+        - $CXX --version
+        - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh
     
     - env:    TEST_NAME="gcc 4.6 (make) bundled"
       compiler: gcc
@@ -91,14 +94,14 @@ matrix:
         - $CXX --version
         - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh
     
-    #- env:    TEST_NAME="gcc 4.6 (make) unbundled"
-    #  compiler: gcc
-    #  script:
-    #    - export CC="gcc"
-    #    - export CXX="g++"
-    #    - $CXX --version
-    #    - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev
-    #    - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh
+    - env:    TEST_NAME="gcc 4.6 (make) unbundled"
+      compiler: gcc
+      script:
+        - export CC="gcc"
+        - export CXX="g++"
+        - $CXX --version
+        - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev
+        - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh
 
     - env:    TEST_NAME="gcc 4.8 (make) bundled"
       compiler: gcc
@@ -108,14 +111,14 @@ matrix:
         - $CXX --version
         - ./configure --everything && make -s -j2 && ./travis/Linux/runtests.sh
     
-    #- env:    TEST_NAME="gcc 4.8 (make) unbundled"
-    #  compiler: gcc
-    #  script:
-    #    - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev
-    #    - export CC="gcc-4.8"
-    #    - export CXX="g++-4.8"
-    #    - $CXX --version
-    #    - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh
+    - env:    TEST_NAME="gcc 4.8 (make) unbundled"
+      compiler: gcc
+      script:
+        - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev
+        - export CC="gcc-4.8"
+        - export CXX="g++-4.8"
+        - $CXX --version
+        - ./configure --everything --unbundled && make -s -j2 && ./travis/Linux/runtests.sh
     
     - env:    TEST_NAME="arm-linux-gnueabi- (make)"
       compiler: gcc