From 6d11fe6f93841f43d205b118da98a9513d033355 Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Tue, 28 Mar 2017 11:19:57 +0300
Subject: [PATCH] Travis CI: Replace multiple CONF_x with a single CONF_OPTIONS
 variable (Cherry-pick commit b7014e6 from 'master' branch.)

---
 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b58a18c..4c5184f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,38 +11,38 @@ matrix:
       compiler: clang
       env:
         - CFLAGS_EXTRA="-O3 -march=native"
-        - CONF_ASSERTIONS=--enable-assertions
+        - CONF_OPTIONS="--enable-assertions"
     - os: linux
       compiler: gcc
       env:
         - CFLAGS_EXTRA="-O3 -march=native"
-        - CONF_ASSERTIONS=--enable-assertions
+        - CONF_OPTIONS="--enable-assertions"
     - os: osx
       env:
         - CFLAGS_EXTRA="-O3 -march=native"
-        - CONF_ASSERTIONS=--enable-assertions
+        - CONF_OPTIONS="--enable-assertions"
     - os: linux
       addons: { apt: { packages: [ gcc-multilib ] } }
       compiler: clang
       env:
         - CFLAGS_EXTRA="-m32 -march=native"
-        - CONF_ASSERTIONS=--enable-assertions
+        - CONF_OPTIONS="--enable-assertions"
     - os: linux
       addons: { apt: { packages: [ gcc-multilib ] } }
       compiler: gcc
       env:
         - CFLAGS_EXTRA="-m32 -march=native"
-        - CONF_ASSERTIONS=--enable-assertions
+        - CONF_OPTIONS="--enable-assertions"
     - os: osx
       env:
         - CFLAGS_EXTRA="-m32 -march=native"
-        - CONF_ASSERTIONS=--enable-assertions
+        - CONF_OPTIONS="--enable-assertions"
 
 install:
   - ./autogen.sh
 
 script:
-  - ./configure $CONF_ASSERTIONS
+  - ./configure $CONF_OPTIONS
   - cat src/config.h
   - make -j check CFLAGS_EXTRA="$CFLAGS_EXTRA"
   - if [ -f tests/test_atomic.log ]; then cat tests/test_atomic*.log; fi
-- 
2.7.4