travis tuning

diff --git a/.gitignore b/.gitignore
index a357ffc9766633982bc6d1852a3ff0fb057a387b..d30d12679b0160c2b229de7d62b22ffe700ffc17 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ src/fping6
 stamp-h1
 doc/fping.8
 doc/fping6.8
+ci/build

diff --git a/.travis.yml b/.travis.yml
index 767d553cb194bd9ed56ace0ea876e29c0ead4d60..62bac5e398af54c697e51e5c529ce9b8f07d8736 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,9 @@ compiler:
 branches:
   only:
       - master
+before_install:
+    - sudo apt-get remove -qq autoconf automake autotools-dev libtool
+    - ci/build-1-autotools.sh
 script:
-    - ./autogen.sh
-    - ./configure --enable-ipv4 --enable-ipv6 --prefix=/opt/fping
-    - make
-    - sudo make install
-    - sudo /opt/fping/sbin/fping 127.0.0.1
+    - ci/build-2-install.sh
+    - ci/test-1.sh

diff --git a/ci/build-1-autotools.sh b/ci/build-1-autotools.sh
new file mode 100755 (executable)
index 0000000..2e7631e
--- /dev/null
+++ b/ci/build-1-autotools.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+AUTOCONF=http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
+AUTOMAKE=http://ftp.gnu.org/gnu/automake/automake-1.14.1.tar.gz
+LIBTOOL=http://alpha.gnu.org/gnu/libtool/libtool-2.4.2.418.tar.gz
+PREFIX=$(pwd)/build
+
+set -e
+
+if [ ! -d ci ]; then
+    echo "you must run this in the root fping directory" >&2
+    exit 1
+fi
+
+cd ci
+rm -rf build
+mkdir -p build/src
+cd build/src
+
+### autoconf
+
+(
+AUTOCONF_FILE=$(basename $AUTOCONF)
+AUTOCONF_DIR=$(echo $AUTOCONF_FILE | sed -e 's/\.tar.*//')
+wget $AUTOCONF
+tar xf $AUTOCONF_FILE
+cd $AUTOCONF_DIR
+./configure --prefix=$PREFIX
+make install
+)
+
+### automake
+
+(
+AUTOMAKE_FILE=$(basename $AUTOMAKE)
+AUTOMAKE_DIR=$(echo $AUTOMAKE_FILE | sed -e 's/\.tar.*//')
+wget $AUTOMAKE
+tar xf $AUTOMAKE_FILE
+cd $AUTOMAKE_DIR
+./configure --prefix=$PREFIX
+make install
+)
+
+### libtool
+
+(
+LIBTOOL_FILE=$(basename $LIBTOOL)
+LIBTOOL_DIR=$(echo $LIBTOOL_FILE | sed -e 's/\.tar.*//')
+wget $LIBTOOL
+tar xf $LIBTOOL_FILE
+cd $LIBTOOL_DIR
+./configure --prefix=$PREFIX
+make install
+)

diff --git a/ci/build-2-install.sh b/ci/build-2-install.sh
new file mode 100755 (executable)
index 0000000..6a511ee
--- /dev/null
+++ b/ci/build-2-install.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [ ! -d ci ]; then
+    echo "you must run this in the root fping directory" >&2
+    exit 1
+fi
+
+PATH=$(pwd)/ci/build/bin:$PATH
+
+autoreconf -i
+./configure --enable-ipv4 --enable-ipv6 --prefix=/opt/fping
+make 
+sudo make install

diff --git a/ci/test-1.sh b/ci/test-1.sh
new file mode 100644 (file)
index 0000000..889c5ba
--- /dev/null
+++ b/ci/test-1.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ ! -d ci ]; then
+    echo "you must run this in the root fping directory" >&2
+    exit 1
+fi
+
+sudo /opt/fping/sbin/fping 127.0.0.1