Skip to content

Commit 8f7abb2

Browse files
authored
Merge branch 'uutils:main' into fix/dd-bs-not-positive
2 parents ef02de9 + fca0d04 commit 8f7abb2

164 files changed

Lines changed: 2649 additions & 828 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
uu_shuf,
4949
uu_sort,
5050
uu_split,
51+
uu_timeout,
5152
uu_tsort,
5253
uu_unexpand,
5354
uu_uniq,

.github/workflows/ignore-intermittent.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
tests/cut/bounded-memory
22
tests/date/date-locale-hour
33
tests/date/resolution
4+
tests/expand/bounded-memory
45
tests/pr/bounded-memory
56
tests/tail/inotify-dir-recreate
67
tests/tail/overlay-headers

.github/workflows/wasi.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ jobs:
3636
env:
3737
CARGO_TARGET_WASM32_WASIP1_RUNNER: wasmtime
3838
run: |
39-
cargo test --target wasm32-wasip1 --no-default-features -p uu_echo -p uu_cut
39+
# Get all utilities and exclude ones that don't compile for wasm32-wasip1
40+
EXCLUDE="dd|df|du|env|expr|mktemp|more|tac|test"
41+
UTILS=$(./util/show-utils.sh | tr ' ' '\n' | grep -vE "^($EXCLUDE)$" | sed 's/^/-p uu_/' | tr '\n' ' ')
42+
cargo test --target wasm32-wasip1 --no-default-features $UTILS

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ repos:
4747
- id: cargo-lock-check
4848
name: Cargo.lock sync check
4949
description: Ensure Cargo.lock and fuzz/Cargo.lock are up-to-date.
50-
entry: bash -c 'for dir in . fuzz; do ( cd "$dir" && cargo fetch --locked --quiet ) || { echo "ERROR - $dir/Cargo.lock is out of date. Run -> cd $dir && cargo update"; exit 1; } done'
50+
entry: bash -c 'for dir in . fuzz; do ( cd "$dir" && cargo fetch --quiet ); done'
5151
pass_filenames: false
5252
files: 'Cargo\.(toml|lock)$'
5353
language: system

.vscode/cspell.dictionaries/jargon.wordlist.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,9 @@ nofield
219219
dtolnay
220220
Swatinem
221221

222+
preopened
223+
dotdot
224+
222225
# * clippy
223226
uninlined
224227
nonminimal

.vscode/cspell.dictionaries/workspace.wordlist.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@ uutests
366366
uutils
367367

368368
# * function names
369+
execfn
369370
getcwd
370371
setpipe
371372

Cargo.lock

Lines changed: 16 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coreutils (uutils)
22
# * see the repository LICENSE, README, and CONTRIBUTING files for more information
33

4-
# spell-checker:ignore (libs) bigdecimal datetime foldhash serde gethostid kqueue libselinux mangen memmap uuhelp startswith constness expl unnested logind cfgs interner
4+
# spell-checker:ignore (libs) bigdecimal datetime foldhash serde gethostid kqueue libselinux mangen memmap uuhelp startswith constness expl unnested logind cfgs interner getauxval
55

66
[package]
77
name = "coreutils"
@@ -454,7 +454,9 @@ rstest = "0.26.0"
454454
rstest_reuse = "0.7.0"
455455
rustc-hash = "2.1.1"
456456
rust-ini = "0.21.0"
457-
rustix = "1.1.4"
457+
# binary name of coreutils can be hijacked by overriding getauxval via LD_PRELOAD
458+
# So we use param and avoid libc backend
459+
rustix = { version = "1.1.4", features = ["param"] }
458460
same-file = "1.0.6"
459461
self_cell = "1.0.4"
460462
selinux = "=0.6.0"
@@ -624,6 +626,9 @@ who = { optional = true, version = "0.8.0", package = "uu_who", path = "src/uu/w
624626
whoami = { optional = true, version = "0.8.0", package = "uu_whoami", path = "src/uu/whoami" }
625627
yes = { optional = true, version = "0.8.0", package = "uu_yes", path = "src/uu/yes" }
626628

629+
[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
630+
rustix.workspace = true
631+
627632
# this breaks clippy linting with: "tests/by-util/test_factor_benches.rs: No such file or directory (os error 2)"
628633
# factor_benches = { optional = true, version = "0.0.0", package = "uu_factor_benches", path = "tests/benches/factor" }
629634

0 commit comments

Comments
 (0)