From 5cbb3142e0365cfdadd8d405efa0f4f1902072eb Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Tue, 19 Mar 2024 13:29:08 -0400
Subject: [PATCH] ci: Update bfs to 3.1.3

---
 .github/workflows/compat.yml | 2 +-
 util/build-bfs.sh            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/compat.yml b/.github/workflows/compat.yml
index 367632b5..5aeeaa28 100644
--- a/.github/workflows/compat.yml
+++ b/.github/workflows/compat.yml
@@ -90,7 +90,7 @@ jobs:
       with:
         repository: tavianator/bfs
         path: bfs
-        ref: '3.0.3'
+        ref: '3.1.3'
     - name: Install `rust` toolchain
       run: |
         ## Install `rust` toolchain
diff --git a/util/build-bfs.sh b/util/build-bfs.sh
index f99199b6..47b9335a 100755
--- a/util/build-bfs.sh
+++ b/util/build-bfs.sh
@@ -13,7 +13,7 @@ cargo build --release
 FIND=$(readlink -f target/release/find)
 
 cd ..
-make -C bfs -j "$(nproc)" bin/tests/{mksock,xtouch} USE_ONIGURUMA=
+make -C bfs -j "$(nproc)" bin/tests/{mksock,xtouch} NOLIBS=y
 
 # Run the GNU find compatibility tests by default
 if test "$#" -eq 0; then
@@ -23,9 +23,9 @@ fi
 LOG_FILE=bfs/tests.log
 ./bfs/tests/tests.sh --bfs="$FIND" "$@" | tee "$LOG_FILE" || :
 
-PASS=$(sed -n "s/^tests passed: \(.*\)/\1/p" "$LOG_FILE" | head -n1)
-SKIP=$(sed -n "s/^tests skipped: \(.*\)/\1/p" "$LOG_FILE" | head -n1)
-FAIL=$(sed -n "s/^tests failed: \(.*\)/\1/p" "$LOG_FILE" | head -n1)
+PASS=$(sed -En 's|^\[PASS] *([0-9]+) / .*|\1|p' "$LOG_FILE")
+SKIP=$(sed -En 's|^\[SKIP] *([0-9]+) / .*|\1|p' "$LOG_FILE")
+FAIL=$(sed -En 's|^\[FAIL] *([0-9]+) / .*|\1|p' "$LOG_FILE")
 
 # Default any missing numbers to zero (e.g. no tests skipped)
 : ${PASS:=0}