From f1a56dea7b616640d7dfc7ce45580304383bc4f5 Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <nhofmeyr@sysmocom.de>
Date: Fri, 7 Oct 2016 00:58:22 +0200
Subject: [PATCH] jenkins.sh: use osmo-build-dep.sh, log test failures

Like in libosmo-abis' jenkins.sh

Change-Id: I4d6ffd5b230dd095650cc2231678b66056a8e4b5
---
 contrib/jenkins.sh | 63 +++++++++++++++++-----------------------------
 1 file changed, 23 insertions(+), 40 deletions(-)

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 3c60996dc..7ad4ee652 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -5,64 +5,47 @@ set -ex
 base="$PWD"
 deps="$base/deps"
 inst="$deps/install"
+export deps inst
 
 mkdir "$deps" || true
 rm -rf "$inst"
 
-build_dep() {
-	project="$1"
-	branch="$2"
-	cfg="$3"
-	set +x
-	echo
-	echo
-	echo
-	echo " =============================== $project ==============================="
-	echo
-	set -x
-	if [ -z "$project" ]; then
-		echo "internal failure"
-		exit 1
-	fi
-	cd "$deps"
-	rm -rf "$project"
-	osmo-deps.sh "$project"
-	cd "$project"
-	if [ -n "$branch" ]; then
-		git checkout "$branch"
-	fi
-	git rev-parse HEAD
-	autoreconf --install --force
-	./configure --prefix="$inst" $cfg
-	$MAKE $PARALLEL_MAKE install
-}
+osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false
 
-build_dep libosmocore "" ac_cv_path_DOXYGEN=false
-
-# All below builds want this PKG_CONFIG_PATH
 export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
+export LD_LIBRARY_PATH="$inst/lib"
 
 if [ "x$IU" = "x--enable-iu" ]; then
 	netif_branch="sysmocom/sctp"
 	sccp_branch="sysmocom/iu"
 fi
 
-build_dep libosmo-abis
-build_dep libosmo-netif $netif_branch
-build_dep libosmo-sccp $sccp_branch
-PARALLEL_MAKE="" build_dep libsmpp34
-build_dep openggsn
+osmo-build-dep.sh libosmo-abis
+osmo-build-dep.sh libosmo-netif $netif_branch
+osmo-build-dep.sh libosmo-sccp $sccp_branch
+PARALLEL_MAKE="" osmo-build-dep.sh libsmpp34
+osmo-build-dep.sh openggsn
 
 if [ "x$IU" = "x--enable-iu" ]; then
-	build_dep libasn1c
-	#build_dep asn1c aper-prefix # only needed for make regen in osmo-iuh
-	build_dep osmo-iuh
+	osmo-build-dep.sh libasn1c
+	#osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh
+	osmo-build-dep.sh osmo-iuh
 fi
 
+set +x
+echo
+echo
+echo
+echo " =============================== openbsc ==============================="
+echo
+set -x
+
 cd "$base"
 cd openbsc
 autoreconf --install --force
 ./configure --enable-osmo-bsc --enable-nat $SMPP $MGCP $IU --enable-vty-tests --enable-external-tests
 $MAKE $PARALLEL_MAKE
-LD_LIBRARY_PATH="$inst/lib" $MAKE check
-LD_LIBRARY_PATH="$inst/lib" $MAKE distcheck
+LD_LIBRARY_PATH="$inst/lib" $MAKE check \
+  || cat-testlogs.sh
+LD_LIBRARY_PATH="$inst/lib" $MAKE distcheck \
+  || cat-testlogs.sh