From 1d9e7aaad1f72016eb5ddbaa89082a160d66a7f2 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 4 May 2016 17:40:05 -0400
Subject: [PATCH] babeltrace: set up tap parser for new test driver

---
 jobs/babeltrace.yaml        | 4 ++--
 scripts/babeltrace/build.sh | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index f3f1238..172b7cf 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -72,7 +72,7 @@
     # TODO: Scan for open tasks
     publishers:
       - tap:
-          results: 'tap/**/*.tap'
+          results: 'tests/**/*.log'
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
@@ -98,7 +98,7 @@
     <<: *babeltrace_version_buildtype_anchor
     publishers:
       - tap:
-          results: 'tap/**/*.tap'
+          results: 'tests/**/*.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 442feb9..f007acf 100755
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -141,7 +141,8 @@ $MAKE install
 # Run tests
 $MAKE check
 
-$MAKE clean
+# Remove global test suite log file, it confuses the tap parser
+rm -f tests/test-suite.log
 
 # Cleanup rpath in executables and shared libraries
 find $WORKSPACE/build/bin -type f -perm -0500 -exec chrpath --delete {} \;
-- 
2.34.1