From 02132c2efb6daa213aa07b805ccb0c20241ca2f7 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Thu, 31 Jan 2019 23:43:19 -0500
Subject: Makefile: New distcheck target

To catch more errors automatically, this new target runs the tests in
multiple configurations, including various sanitizers and with/without
optimization.
---
 .travis.yml | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 393a947..1acc520 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,37 +1,24 @@
 language: c
 
-script: make check
+script: make distcheck
 
 addons:
   apt:
     packages:
-      - acl-dev
+      - gcc-multilib
+      - libacl1-dev
+      - libacl1:i386
       - libcap-dev
+      - libcap2:i386
 
 matrix:
   include:
     - os: linux
-      dist: trusty
-      sudo: false
-      compiler: gcc
-
-    - os: linux
-      dist: trusty
-      sudo: false
-      compiler: gcc
-      env:
-        - CFLAGS="-m32 -g -Wall"
-      addons:
-        apt:
-          packages:
-            - gcc-multilib
-            - acl-dev:i386
-            - libcap-dev:i386
-
-    - os: linux
-      dist: trusty
-      sudo: false
-      compiler: clang
+      dist: xenial
+      before_script:
+        # Ubuntu doesn't let you install the -dev packages for both amd64 and
+        # i386 at once, so we make our own symlinks to fix -m32 -lacl -lcap
+        - sudo ln -s libacl.so.1 /lib/i386-linux-gnu/libacl.so
+        - sudo ln -s libcap.so.2 /lib/i386-linux-gnu/libcap.so
 
     - os: osx
-      compiler: clang
-- 
cgit v1.2.3