From 3f98220d5da00bf39fa349a37d87ecee2df5a928 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 1 Jan 2026 15:54:06 +0100 Subject: [PATCH] test: simplify Signed-off-by: Joachim Wiberg --- .github/workflows/build.yml | 4 +--- .github/workflows/release.yml | 4 +--- .github/workflows/weekly.yml | 4 +--- test/setup-sysroot.sh | 3 --- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 36c92935..729a02ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,6 +84,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: finit-test-${{ matrix.compiler }} - path: | - test/*.log - test/sysroot/setup-sysroot.log + path: test/*.log diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b020cefd..f90c4b22 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,9 +69,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: finit-release-test-logs - path: | - finit-*/_build/sub/test/*.log - finit-*/_build/sub/test/sysroot/setup-sysroot.log + path: finit-*/_build/sub/test/*.log - name: Extract ChangeLog entry ... run: | awk '/-----*/{if (x == 1) exit; x=1;next}x' doc/ChangeLog.md \ diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 3fb05fc0..4fe7e6cd 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -64,6 +64,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: finit-weekly-test-logs - path: | - finit-*/_build/sub/test/*.log - finit-*/_build/sub/test/sysroot/setup-sysroot.log + path: finit-*/_build/sub/test/*.log diff --git a/test/setup-sysroot.sh b/test/setup-sysroot.sh index b39f9949..d6787f4d 100755 --- a/test/setup-sysroot.sh +++ b/test/setup-sysroot.sh @@ -2,9 +2,6 @@ set -eu -# Log setup output for debugging -SETUP_LOG="${SYSROOT:-./sysroot}/setup-sysroot.log" -exec > >(tee "$SETUP_LOG") 2>&1 echo "=== Finit Test Sysroot Setup ===" echo "Date: $(date)" echo "SYSROOT: $SYSROOT"