From e6be9fb081c8e72001399813d032124d0117899d Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 5 May 2016 11:30:43 -0400
Subject: [PATCH] Babeltrace: checkout sources in a subdirectory

---
 jobs/babeltrace.yaml        |  5 +++--
 scripts/babeltrace/build.sh | 45 ++++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 172b7cf..637a997 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -30,6 +30,7 @@
           browser-url: https://github.com/{github_user}/{github_name}
           branches:
             - origin/{version}
+          basedir: src/babeltrace
 
     triggers:
       - pollscm:
@@ -72,7 +73,7 @@
     # TODO: Scan for open tasks
     publishers:
       - tap:
-          results: 'tests/**/*.log'
+          results: 'tap/**/*.log'
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
@@ -98,7 +99,7 @@
     <<: *babeltrace_version_buildtype_anchor
     publishers:
       - tap:
-          results: 'tests/**/*.log'
+          results: 'tap/**/*.log'
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index f007acf..96430e5 100755
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -16,12 +16,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-# Create build directory
-rm -rf $WORKSPACE/build
-mkdir -p $WORKSPACE/build
-
+SRCDIR="$WORKSPACE/src/babeltrace"
+TMPDIR="$WORKSPACE/tmp"
 PREFIX="$WORKSPACE/build"
 
+# Create build and tmp directories
+rm -rf "$PREFIX" "$TMPDIR"
+mkdir -p "$PREFIX" "$TMPDIR"
+
 # Set platform variables
 case "$arch" in
 solaris10)
@@ -78,8 +80,10 @@ python-bindings)
     ;;
 esac
 
+# Enter the source directory
+cd "$SRCDIR"
 
-# Run bootstrap prior to configure
+# Run bootstrap in the source directory prior to configure
 ./bootstrap
 
 
@@ -90,15 +94,14 @@ esac
 #
 # Make sure to move to the build_path and configure
 # before continuing
-BUILD_PATH=$WORKSPACE
-TEST_PLAN_PATH=$WORKSPACE
+BUILD_PATH="$SRCDIR"
 case "$build" in
     oot)
         echo "Out of tree build"
         BUILD_PATH=$WORKSPACE/oot
         mkdir -p $BUILD_PATH
         cd $BUILD_PATH
-        MAKE=$MAKE BISON="$BISON" YACC="$YACC" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$SRCDIR/configure" --prefix=$PREFIX $CONF_OPTS
         ;;
 
     dist)
@@ -106,7 +109,7 @@ case "$build" in
         BUILD_PATH=`mktemp -d`
 
         # Initial configure and generate tarball
-        MAKE=$MAKE BISON="$BISON" YACC="$YACC" ./configure
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$SRCDIR/configure"
         $MAKE dist
 
         mkdir -p $BUILD_PATH
@@ -117,20 +120,17 @@ case "$build" in
         $TAR xvf *.tar.* --strip 1
 
         MAKE=$MAKE BISON="$BISON" YACC="$YACC" $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
-
-        # Set test plan to dist tar
-        TEST_PLAN_PATH=$BUILD_PATH
         ;;
 
     clang)
         echo "LLVM clang build"
         export CC=clang
         clang -v
-	MAKE=$MAKE BISON="$BISON" YACC="$YACC" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
+	MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$SRCDIR/configure" --prefix=$PREFIX $CONF_OPTS
         ;;
     *)
-        echo "Standard tree build"
-        MAKE=$MAKE BISON="$BISON" YACC="$YACC" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
+        echo "Standard in-tree build"
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$SRCDIR/configure" --prefix=$PREFIX $CONF_OPTS
         ;;
 esac
 
@@ -141,19 +141,22 @@ $MAKE install
 # Run tests
 $MAKE check
 
-# Remove global test suite log file, it confuses the tap parser
-rm -f tests/test-suite.log
+# Copy tap logs for the jenkins tap parser
+rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap"
+
+# Clean the build directory
+$MAKE clean
 
 # Cleanup rpath in executables and shared libraries
-find $WORKSPACE/build/bin -type f -perm -0500 -exec chrpath --delete {} \;
-find $WORKSPACE/build/lib -name "*.so" -exec chrpath --delete {} \;
+find $PREFIX/bin -type f -perm -0500 -exec chrpath --delete {} \;
+find $PREFIX/lib -name "*.so" -exec chrpath --delete {} \;
 
 # Remove libtool .la files
-find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \;
+find $PREFIX/lib -name "*.la" -exec rm -f {} \;
 
 # Clean temp dir for dist build
 if [ "$build" = "dist" ]; then
-    cd $WORKSPACE
+    cd $SRCDIR
     rm -rf $BUILD_PATH
 fi
 
-- 
2.34.1