From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 2 May 2016 15:54:10 +0000 (-0400)
Subject: Added macosxbuild job to babeltrace
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=221450b6653154d154fdad4080ee2870a21c078d;hp=e05248e575bb0e22e3ea974cd4e8ef72433d18a9;p=lttng-ci.git

Added macosxbuild job to babeltrace

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 0feebc2..53afda7 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -283,6 +283,13 @@
           version:
             - stable-1.3
             - master
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: macosxbuild
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, static]
+          version:
+            - master
       - 'babeltrace_{version}_cppcheck'
       - 'babeltrace_{version}_scan-build'
       - 'babeltrace_{version}_pylint'
diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 29f470f..d545b99 100755
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -39,6 +39,16 @@ solaris11)
     YACC="$BISON -y"
     export PATH="$PATH:/usr/perl5/bin"
     ;;
+macosx)
+    MAKE=make
+    TAR=tar
+    NPROC="getconf _NPROCESSORS_ONLN"
+    BISON="bison"
+    YACC="$BISON -y"
+    export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+    export CFLAGS="-I/opt/local/include"
+    export LDFLAGS="-L/opt/local/lib"
+    ;;
 *)
     MAKE=make
     TAR=tar
@@ -55,7 +65,7 @@ static)
     echo "Static build"
     CONF_OPTS="--enable-static --disable-shared"
     ;;
-python-bindings)  
+python-bindings)
     echo "Build with python bindings"
     # We only support bindings built with Python 3
     export PYTHON="python3"
@@ -93,7 +103,7 @@ case "$build" in
 
     dist)
         echo "Distribution out of tree build"
-	BUILD_PATH=`mktemp -d`
+        BUILD_PATH=`mktemp -d`
 
         # Initial configure and generate tarball
         MAKE=$MAKE BISON="$BISON" YACC="$YACC" ./configure
@@ -123,10 +133,7 @@ $MAKE -j `$NPROC` V=1
 $MAKE install
 
 # Run tests
-cd ./tests
-# Run make check tests
-prove --merge -v --exec '' - < $WORKSPACE/tests/tests
-cd ..
+$MAKE check
 
 $MAKE clean