travis tuning

diff --git a/.travis.yml b/.travis.yml
index 1adadbbeb4c865dabd7c80d559b9ea518c6ed9d5..d1cca2afa18a59642b240a537b35abcc83668771 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,12 +10,13 @@ branches:
     only:
         - master
 install:
-    - sudo apt-get remove -qq autoconf automake autotools-dev libtool
     - ci/build-1-autotools.sh
     - curl -L http://cpanmin.us | perl - --sudo App::cpanminus
     - cpanm --sudo Test::Command
 script:
     - ci/build-2-install.sh
     - prove ci/test-*.pl
+    - make dist
+    - ci/test-tarball.sh
 after_success:
     - ci/deploy-bintray.sh

diff --git a/ci/build-1-autotools.sh b/ci/build-1-autotools.sh
index a8f142aec8f706ad5a39f3b1fae12acfb368f56f..0e05c137e38906388e6cd9dcecbf86f6749121f1 100755 (executable)
--- a/ci/build-1-autotools.sh
+++ b/ci/build-1-autotools.sh
@@ -11,13 +11,16 @@ if [ ! -d ci ]; then
     exit 1
 fi
 
+# remove standard versions
+sudo apt-get remove -qq autoconf automake autotools-dev libtool
+
+# prepare build environment
 cd ci
 rm -rf build
 mkdir -p build/src
 cd build/src
 
-### autoconf
-
+# autoconf
 (
 AUTOCONF_FILE=$(basename $AUTOCONF)
 AUTOCONF_DIR=$(echo $AUTOCONF_FILE | sed -e 's/\.tar.*//')
@@ -28,8 +31,7 @@ cd $AUTOCONF_DIR
 make install
 )
 
-### automake
-
+# automake
 (
 AUTOMAKE_FILE=$(basename $AUTOMAKE)
 AUTOMAKE_DIR=$(echo $AUTOMAKE_FILE | sed -e 's/\.tar.*//')
@@ -40,8 +42,7 @@ cd $AUTOMAKE_DIR
 make install
 )
 
-### libtool
-
+# libtool
 (
 LIBTOOL_FILE=$(basename $LIBTOOL)
 LIBTOOL_DIR=$(echo $LIBTOOL_FILE | sed -e 's/\.tar.*//')

diff --git a/ci/test-tarball.sh b/ci/test-tarball.sh
new file mode 100755 (executable)
index 0000000..efb8fbe
--- /dev/null
+++ b/ci/test-tarball.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# make sure that the .tar.gz file contains everything necessary
+# to build fping
+
+set -e
+set -x
+
+TARFILE=fping-*.tar.gz
+if [ ! -f "$TARFILE" ]; then
+    echo "tar.gz file not found." >&2
+    exit 1
+fi
+
+# unarchive
+TMPDIR=$(mktemp -d --tmpdir=.)
+cd $TMPDIR
+tar xf ../$TARFILE
+DIRNAME=$(ls)
+
+# build
+cd $DIRNAME
+./configure --enable-ipv4 --enable-ipv6
+make