babeltrace: set up tap parser for new test driver

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index f3f1238c7e619f9562a9a244ecb698188abe7be1..172b7cf50f4f254ae0293108a83009291d96def2 100644 (file)
--- 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 442feb94be46495eec7454e7537fb50e340a82b4..f007acfb50a621bf0ef7843197e7408809bbc4a2 100755 (executable)
--- 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 {} \;