aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-10-07 00:49:12 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-10-07 00:49:12 +0200
commitfb88e6b78ea7fadd8eb0e07c6ecb2b1539874f97 (patch)
tree9039e3d32c9b875f4528492f673b25c60ea4aece /contrib
parentd0b6eb477712b707313dfb731e188ae5439b4cd0 (diff)
jenkins.sh: use osmo-build-dep.sh, log test failures
Like in libosmo-abis' jenkins.sh Change-Id: I022fbaaa1d211f68b38f18cfaf338ece51198c34
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/jenkins.sh42
1 files changed, 24 insertions, 18 deletions
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index a347e3c..9a37ca5 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -2,25 +2,31 @@
set -ex
-rm -rf deps/install
-mkdir deps || true
-cd deps
-osmo-deps.sh libosmocore
+base="$PWD"
+deps="$base/deps"
+inst="$deps/install"
+export deps inst
-cd libosmocore
-autoreconf --install --force
-./configure --prefix=$PWD/../install
-$MAKE $PARALLEL_MAKE install
+mkdir "$deps" || true
+rm -rf "$inst"
-cd ../
-osmo-deps.sh libosmo-abis
-cd libosmo-abis
-autoreconf --install --force
-PKG_CONFIG_PATH=$PWD/../install/lib/pkgconfig:$PKG_CONFIG_PATH ./configure --prefix=$PWD/../install
-PKG_CONFIG_PATH=$PWD/..//install/lib/pkgconfig:$PKG_CONFIG_PATH $MAKE $PARALLEL_MAKE install
+osmo-build-dep.sh libosmocore
+
+export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
+export LD_LIBRARY_PATH="$inst/lib"
+
+osmo-build-dep.sh libosmo-abis
+
+set +x
+echo
+echo
+echo
+echo " =============================== libosmo-netif ==============================="
+echo
+set -x
-cd ../../
autoreconf --install --force
-PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig:$PKG_CONFIG_PATH ./configure
-PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig:$PKG_CONFIG_PATH $MAKE $PARALLEL_MAKE
-PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig:$PKG_CONFIG_PATH LD_LIBRARY_PATH=$PWD/deps/install/lib $MAKE distcheck
+./configure
+$MAKE $PARALLEL_MAKE
+$MAKE distcheck \
+ || cat-testlogs.sh