CP-18405 add integration tests to Travis CI using Docker

Tests are now split into simple tests (test) and integration tests (test-integration) that require external tools. These are provided in a Docker container which is run on Travis.

* build shared libraries
* use Docker for running integration tests
* add comments to travis-ci.sh to explain use of init-container.sh

Signed-off-by: Christian Lindig <[email protected]>

Author: lindig

.travis.yml

@@ -1,13 +1,10 @@
 
+os:
+- linux
+sudo: required
 language: c
-sudo: false
-
-matrix:
-  include:
-    - compiler: gcc
-      os: linux
+services:
+- docker
 
 script:
-  - make
-  - make test
-
+  - docker run -itv $PWD:/mnt xenserver/xenserver-build-env bash -c "cd /mnt; ./travis-ci.sh"

Makefile

@@ -5,17 +5,22 @@
 #
 # yum install -y ocaml-rrd-transport-devel
 #
+# We don't have an install target because installation is handled
+# from the spec file.
+
+
+NAME    = rrd-client-lib
+VERSION = 1.0.0
 
 CC	= gcc
-CFLAGS	= -std=gnu99 -g -Wall
+CFLAGS	= -std=gnu99 -g -fpic -Wall
 OBJ	+= librrd.o
 OBJ 	+= parson/parson.o
 LIB     += -lz
 
-OCB 	= ocamlbuild -use-ocamlfind
 
 .PHONY: all
-all:	librrd.a rrdtest rrdclient
+all:	librrd.a librrd.so rrdtest rrdclient
 
 .PHONY: clean
 clean:
@@ -26,15 +31,14 @@ clean:
 	rm -f rrdtest.o rrdtest
 	rm -f rrdclient.o rrdclient
 	rm -rf config.xml cov-int html coverity.out
-	cd ocaml;  $(OCB) -clean
 
 .PHONY: test
 test: 	rrdtest rrdclient
 	./rrdtest
 	seq 1 10 | ./rrdclient rrdclient.rrd
 
 .PHONY: test-integration
-test-integration: 
+test-integration: rrdclient
 	seq 1 10 | while read i; do \
 		echo $$i | ./rrdclient rrdclient.rrd ;\
 		rrdreader file --once rrdclient.rrd v2 ;\
@@ -65,12 +69,20 @@ librrd.a: $(OBJ)
 	ar rc $@ $(OBJ)
 	ranlib $@
 
+librrd.so: $(OBJ)
+	$(CC) -shared -o $@ $(OBJ)
+
 rrdtest: rrdtest.o librrd.a
 	$(CC) $(CFLAGS) -o $@ $^ $(LIB)
 
 rrdclient: rrdclient.o librrd.a
 	$(CC) $(CFLAGS) -o $@ $^ $(LIB)
 
+.PHONY: tar
+tar:
+	git archive --format=tar --prefix=$(NAME)-$(VERSION)/  HEAD\
+		| gzip > $(NAME)-$(VERSION).tar.gz
+
 # coverity analysis
 
 COV_OPTS += --cpp

travis-ci.sh

@@ -0,0 +1,16 @@
+#! /bin/sh
+#
+# This script is run inside the Docker xenserver/xenserver-build-env
+# container on Travis.
+#
+set -e
+
+# init-container.sh executes either COMMAND or opens a login shell.
+# We just want it to do the initialisation and so we provide a dummy
+# command and do everything else explicitly here.
+env COMMAND=":" /usr/local/bin/init-container.sh
+sudo yum install -y ocaml-rrd-transport-devel
+cd /mnt
+make
+make test
+make test-integration