Skip to content

Commit eb31784

Browse files
committed
GnuTests: bump GNU to 9.12 & run some tests depending on newer glibc
1 parent 061490d commit eb31784

3 files changed

Lines changed: 8 additions & 17 deletions

File tree

.github/workflows/GnuTests.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ env:
4040
jobs:
4141
native:
4242
name: Run GNU tests (native)
43-
runs-on: ubuntu-24.04
43+
runs-on: ubuntu-26.04 # some strace? test needs newer glibc to run
4444
steps:
4545
#### Get the code
4646
- name: Checkout code (uutils)
@@ -61,9 +61,6 @@ jobs:
6161
sudo apt-get update
6262
## Check that build-gnu.sh works on the non SELinux system by installing libselinux only on lima
6363
sudo apt-get install -y gperf gdb python3-pyinotify valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev attr quilt
64-
curl --fail --location --silent --show-error --retry 3 --retry-all-errors -o automake_1.18.1-3_all.deb https://sylvestre.ledru.info/debian/automake-1.18.deb
65-
echo "0c6a249892120518ab7bb0711396dc8cd26f15ed4118d0b222ba3cd7368eb248 automake_1.18.1-3_all.deb" | sha256sum --check --strict -
66-
sudo dpkg -i --force-depends automake_1.18.1-3_all.deb
6764
- name: Add various locales
6865
shell: bash
6966
run: |

util/fetch-gnu.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
#!/bin/bash -e
2-
ver="9.11"
2+
ver="9.12"
33
repo=https://github.com/coreutils/coreutils
44
curl -L "${repo}/releases/download/v${ver}/coreutils-${ver}.tar.xz" | tar --strip-components=1 -xJf -
55

66
# TODO stop backporting tests from master at GNU coreutils > $ver
7+
exit 0 # remove me when backport
78
backport=(
8-
cat/splice.sh # split tests
9-
dd/fail-ftruncate-fstat.sh # remove LD_PRELOAD
10-
dd/stderr.sh # replace GNU/test binary by uutils/test
11-
misc/close-stdout.sh # fix hardcoded pathes to GNU executables
12-
misc/uname-labeled.sh # uname -A/--all-labeled, added after $ver
13-
nproc/nproc-quota.sh # remove LD_PRELOAD
14-
misc/empty-backup-suffix.sh
159
)
1610
for f in "${backport[@]}"
1711
do curl -L ${repo}/raw/refs/heads/master/tests/$f > tests/$f

util/gnu-patches/series

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
tests_factor_factor.pl.patch
22
tests_cksum_base64.patch
3-
tests_comm.pl.patch
3+
# FIXME: tests_comm.pl.patch
44
# FIXME: tests_cut_error_msg.patch
55
tests_dup_source.patch
6-
tests_env_env-S.pl.patch
6+
# FIXME: tests_env_env-S.pl.patch
77
tests_invalid_opt.patch
8-
tests_ls_no_cap.patch
8+
# FIXME: tests_ls_no_cap.patch
99
tests_sort_merge.pl.patch
1010
tests_du_move_dir_while_traversing.patch
1111
test_mkdir_restorecon.patch
12-
error_msg_uniq.diff
12+
# FIXME: error_msg_uniq.diff
1313
tests_numfmt.patch
14-
tests_pwd-long.patch
14+
# FIXME: tests_pwd-long.patch

0 commit comments

Comments
 (0)