Travis CI: Test without clone libatomic_ops

diff --git a/.travis.yml b/.travis.yml
index 3b83780..af2e76f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,7 @@ matrix:
     - M4_VER=1.4.18
     - LIBTOOL_VER=2.4.6
     - PKG_CONFIG_VER=0.29.2
+    - NO_CLONE_LIBATOMIC_OPS=true
   - os: linux
     env:
     - MAKEFILE_TARGETS="dist"
@@ -44,6 +45,26 @@ matrix:
     addons:
       apt:
         packages:
+        - libatomic-ops-dev
+    compiler: clang
+    dist: trusty
+    env:
+    - CONF_OPTIONS="--enable-cplusplus"
+    - NO_CLONE_LIBATOMIC_OPS=true
+  - os: linux
+    addons:
+      apt:
+        packages:
+        - libatomic-ops-dev
+    compiler: gcc
+    dist: trusty
+    env:
+    - CONF_OPTIONS="--enable-gc-assertions --enable-cplusplus"
+    - NO_CLONE_LIBATOMIC_OPS=true
+  - os: linux
+    addons:
+      apt:
+        packages:
         - gcc-multilib
     compiler: clang
     env:
@@ -67,6 +88,7 @@ matrix:
     env:
     - CFLAGS_EXTRA="-D CHECKSUMS"
     - CONF_OPTIONS="--disable-threads --enable-cplusplus"
+    - NO_CLONE_LIBATOMIC_OPS=true
   - os: linux
     compiler: clang
     env:
@@ -171,10 +193,12 @@ matrix:
     env:
     - CONF_OPTIONS="--enable-redirect-malloc --disable-threads"
     - CFLAGS_EXTRA="-m32"
+    - NO_CLONE_LIBATOMIC_OPS=true
   - os: osx
     env:
     - CONF_OPTIONS="--enable-redirect-malloc --enable-cplusplus --disable-threads"
     - CFLAGS_EXTRA="-m32"
+    - NO_CLONE_LIBATOMIC_OPS=true
   - os: linux
     compiler: gcc
     env:
@@ -184,15 +208,18 @@ matrix:
     env:
     - CONF_OPTIONS="--disable-static --disable-threads --enable-cplusplus"
     - CFLAGS_EXTRA="-O3 -march=native"
+    - NO_CLONE_LIBATOMIC_OPS=true
   - os: linux
     compiler: gcc
     env:
     - CONF_OPTIONS="--disable-static --disable-threads --enable-cplusplus"
     - CFLAGS_EXTRA="-O3 -march=native"
+    - NO_CLONE_LIBATOMIC_OPS=true
   - os: osx
     env:
     - CONF_OPTIONS="--disable-static --disable-threads --enable-cplusplus"
     - CFLAGS_EXTRA="-O3 -march=native"
+    - NO_CLONE_LIBATOMIC_OPS=true
   - os: osx
     env:
     - CSA_CHECK=true
@@ -417,7 +444,9 @@ before_install:
 - if [[ "$MAKEFILE_TARGETS" == "" ]]; then MAKEFILE_TARGETS="check"; fi
 
 install:
-- git clone --depth=50 https://github.com/ivmai/libatomic_ops.git
+- if [[ "$NO_CLONE_LIBATOMIC_OPS" != true ]]; then
+    git clone --depth=50 https://github.com/ivmai/libatomic_ops.git;
+  fi
 - "./autogen.sh"
 - if [[ "$GNUTOOLS_ROOT" != "" ]]; then mv $GNUTOOLS_ROOT $GNUTOOLS_ROOT-x; fi
 - if [[ "$REPORT_COVERAGE" == true ]]; then gem install coveralls-lcov; fi