From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Sun, 11 May 2014 04:49:02 +0000 (+0200)
Subject: travis-ci: minor cleanup and speedup
X-Git-Tag: v2.25-rc1~154^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ecee3d5567739497abed4cb3ffc0ed97906e0dc;p=thirdparty%2Futil-linux.git

travis-ci: minor cleanup and speedup

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/.travis.yml b/.travis.yml
index e9ddff30fe..47cd62f07f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 language: c
 
+git:
+  depth: 1500
+
 compiler:
   - gcc
   - clang
 
-git:
-  depth: 1500
-
 install:
   # install some packages from Ubuntu's default sources
   - sudo apt-get -qq update
@@ -15,17 +15,12 @@ install:
     libpam-dev
     libudev-dev
     gtk-doc-tools
-  # install/upgrade custom stuff from non-official sources
-  - sudo add-apt-repository -y ppa:dns/gnu
-  - sudo apt-get -qq update
-  - sudo apt-get install -qq
-    autopoint
-    gettext
 
 before_script:
   - ./autogen.sh
 
 script:
+  - export MAKE="make -j4"
   # make distcheck still does not work on travis
   - (./configure
       --disable-use-tty-group
@@ -38,10 +33,10 @@ script:
       --enable-vipw
       --enable-write
     ; err=$?; cat config.log; exit $err)
-    && make
-    && make check
-    && make install DESTDIR=/tmp/dest
-    && make dist
+    && $MAKE
+    && $MAKE check
+    && $MAKE install DESTDIR=/tmp/dest
+    && $MAKE dist
 
 after_script:
   - test -d tests/diff