jjb: binutils-gdb: change guile-2.2 to just guile

[lttng-ci.git] / scripts / binutils-gdb / build.sh

diff --git a/scripts/binutils-gdb/build.sh b/scripts/binutils-gdb/build.sh
index 3d5c6358ffca09ebdc1c91a67436b81f535d9e91..60e4c58fbdf3d46233e8c34a19e06fc0c213389e 100755 (executable)
--- a/scripts/binutils-gdb/build.sh
+++ b/scripts/binutils-gdb/build.sh
@@ -116,7 +116,7 @@ EOF
 # Required variables
 WORKSPACE=${WORKSPACE:-}
 
-arch=${arch:-}
+platform=${platform:-}
 conf=${conf:-}
 build=${build:-}
 target_board=${target_board:-unix}
@@ -136,7 +136,7 @@ export CXXFLAGS="-O2 -fsanitize=address -D_GLIBCXX_DEBUG=1"
 export LDFLAGS="-fsanitize=address"
 
 # Set platform variables
-case "$arch" in
+case "$platform" in
 *)
     export MAKE=make
     export TAR=tar
@@ -173,7 +173,7 @@ case "$conf" in
     CONF_OPTS+=("--with-system-readline" "--with-system-zlib")
 
     # Enable optional features
-    CONF_OPTS+=("--enable-targets=all" "--with-expat=yes" "--with-python=python3" "--with-guile=guile-2.2" "--enable-libctf")
+    CONF_OPTS+=("--enable-targets=all" "--with-expat=yes" "--with-python=python3" "--with-guile" "--enable-libctf")
 
     CONF_OPTS+=("--enable-build-warnings" "--enable-gdb-build-warnings" "--enable-unit-tests" "--enable-ubsan")
 
@@ -624,6 +624,7 @@ EOF
 
 known_failures_file="known-failures-${target_board}"
 grep --invert-match --fixed-strings --file="$known_failures_file"  "${WORKSPACE}/results/gdb.sum" > "${WORKSPACE}/results/gdb.filtered.sum"
+grep --extended-regexp --regexp="^(FAIL|XPASS|UNRESOLVED|DUPLICATE):" "${WORKSPACE}/results/gdb.filtered.sum" > "${WORKSPACE}/results/gdb.fail.sum" || true
 
 # For informational purposes: check if some known failure lines did not appear
 # in the gdb.sum.