]> granicus.if.org Git - gc/commitdiff
Travis CI: Replace multiple CONF_x with a single CONF_OPTIONS variable
authorIvan Maidanski <ivmai@mail.ru>
Sun, 9 Apr 2017 14:42:40 +0000 (17:42 +0300)
committerIvan Maidanski <ivmai@mail.ru>
Sun, 9 Apr 2017 14:42:40 +0000 (17:42 +0300)
(Cherry-pick commit 0138d60 from 'master' branch.)

.travis.yml

index 4d72345e86cde8852c59bec5de5096c1b39a11e9..f4f562b6c07cc24b71616f3d77921c28a634feb1 100644 (file)
@@ -4,71 +4,56 @@ matrix:
   include:
     - os: linux
       compiler: clang
-      env: [ CONF_CPP=--enable-cplusplus ]
+      env: [ CONF_OPTIONS="--enable-cplusplus" ]
     - os: linux
       compiler: gcc
-      env: [ CONF_CPP=--enable-cplusplus ]
+      env: [ CONF_OPTIONS="--enable-cplusplus" ]
     - os: osx
-      env: [ CONF_CPP=--enable-cplusplus ]
+      env: [ CONF_OPTIONS="--enable-cplusplus" ]
     - os: linux
       addons: { apt: { packages: [ gcc-multilib ] } }
       compiler: clang
-      env: [ CFLAGS_EXTRA="-m32", CONF_ASSERTIONS=--enable-gc-assertions ]
+      env: [ CFLAGS_EXTRA="-m32", CONF_OPTIONS="--enable-gc-assertions" ]
     - os: linux
       addons: { apt: { packages: [ gcc-multilib ] } }
       compiler: gcc
-      env: [ CFLAGS_EXTRA="-m32", CONF_ASSERTIONS=--enable-gc-assertions ]
+      env: [ CFLAGS_EXTRA="-m32", CONF_OPTIONS="--enable-gc-assertions" ]
     - os: osx
       env:
         - CFLAGS_EXTRA="-m32"
-        - CONF_ASSERTIONS=--enable-gc-assertions
-        - CONF_CPP=--enable-cplusplus
+        - CONF_OPTIONS="--enable-gc-assertions --enable-cplusplus"
     - os: linux
       compiler: gcc
-      env: [ CONF_GC_DEBUG=--enable-gc-debug, CONF_CPP=--enable-cplusplus ]
+      env: [ CONF_OPTIONS="--enable-gc-debug --enable-cplusplus" ]
     - os: linux
       compiler: gcc
-      env: [ CONF_GC_DEBUG=--disable-gc-debug, CONF_CPP=--enable-cplusplus ]
+      env: [ CONF_OPTIONS="--disable-gc-debug --enable-cplusplus" ]
     - os: linux
       compiler: clang
       env:
-        - CONF_LARGE_CONFIG=--enable-large-config
-        - CONF_M_UNMAP=--enable-munmap
-        - CONF_CPP=--enable-cplusplus
+        - CONF_OPTIONS="--enable-large-config --enable-munmap --enable-cplusplus"
     - os: osx
       env:
-        - CONF_LARGE_CONFIG=--enable-large-config
-        - CONF_M_UNMAP=--enable-munmap
-        - CONF_CPP=--enable-cplusplus
+        - CONF_OPTIONS="--enable-large-config --enable-munmap --enable-cplusplus"
     - os: linux
       compiler: clang
       env:
-        - CONF_STATIC=--disable-static
-        - CONF_THREADS=--disable-threads
+        - CONF_OPTIONS="--disable-static --disable-threads --enable-gc-assertions --enable-cplusplus"
         - CFLAGS_EXTRA="-O3 -march=native"
-        - CONF_ASSERTIONS=--enable-gc-assertions
-        - CONF_CPP=--enable-cplusplus
     - os: linux
       compiler: gcc
       env:
-        - CONF_STATIC=--disable-static
-        - CONF_THREADS=--disable-threads
+        - CONF_OPTIONS="--disable-static --disable-threads --enable-gc-assertions --enable-cplusplus"
         - CFLAGS_EXTRA="-O3 -march=native"
-        - CONF_ASSERTIONS=--enable-gc-assertions
-        - CONF_CPP=--enable-cplusplus
     - os: osx
       env:
-        - CONF_STATIC=--disable-static
-        - CONF_THREADS=--disable-threads
+        - CONF_OPTIONS="--disable-static --disable-threads --enable-gc-assertions --enable-cplusplus"
         - CFLAGS_EXTRA="-O3 -march=native"
-        - CONF_ASSERTIONS=--enable-gc-assertions
-        - CONF_CPP=--enable-cplusplus
 
 install:
   - git clone --depth=50 https://github.com/ivmai/libatomic_ops.git -b release-7_4
   - ./autogen.sh
 
 script:
-  - ./configure $CONF_ASSERTIONS $CONF_CPP $CONF_GC_DEBUG $CONF_LARGE_CONFIG
-                $CONF_M_UNMAP $CONF_STATIC $CONF_THREADS
+  - ./configure $CONF_OPTIONS
   - make -j check CFLAGS_EXTRA="$CFLAGS_EXTRA"