diff --git a/.travis.yml b/.travis.yml index 78a198bc..dffbe61d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,6 @@ arch: amd64 branches: only: - master -script: -- ./configure --with-restconf=fcgi && make && sudo make install && (cd example; make; sudo make install) && (cd util; make; sudo make install) && sudo ldconfig && (cd test; ./all.sh) +script: ./test/travis/script.sh before_script: - - sudo apt-get install -y libfcgi-dev - - sudo apt-get install -y nginx - ./test/travis/before_script.sh diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh index 8ded3e70..019919fd 100755 --- a/test/travis/before_script.sh +++ b/test/travis/before_script.sh @@ -1,5 +1,8 @@ -#!/bin/sh +#!/usr/bin/env bash # Travis pre-config script. +sudo apt-get install -y libfcgi-dev +sudo apt-get install -y nginx + # Clone and install CLIgen (needed for clixon configure and make) # Note travis builds and installs, then starts a clixon container where all tests are run from. git clone https://github.com/clicon/cligen.git diff --git a/test/travis/build_evhtp.sh b/test/travis/build_evhtp.sh index 2e81fb28..2ddb3a5f 100755 --- a/test/travis/build_evhtp.sh +++ b/test/travis/build_evhtp.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Travis pre-config script. # build libevhtp git clone https://github.com/criticalstack/libevhtp.git diff --git a/test/travis/script.sh b/test/travis/script.sh new file mode 100755 index 00000000..92b4b1fd --- /dev/null +++ b/test/travis/script.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +./configure --with-restconf=fcgi +make +sudo make install +(cd example; make; sudo make install) +(cd util; make; sudo make install) +sudo ldconfig +which clixon_backend +sudo clixon_backend +sleep 1 +ps aux|grep clixon +(cd test; ./all.sh)