Skip to content

Commit ed23111

Browse files
authored
Merge branch 'main' into one-fs
2 parents bb3ae51 + 067b296 commit ed23111

File tree

31 files changed

+926
-199
lines changed

31 files changed

+926
-199
lines changed

.github/workflows/GnuTests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ jobs:
258258
echo "REF_FAILING = ${REF_FAILING}"
259259
echo "CURRENT_RUN_FAILING = ${CURRENT_RUN_FAILING}"
260260
echo "REF_SKIP_PASS = ${REF_SKIP}"
261+
echo "CURRENT_RUN_SKIP = ${CURRENT_RUN_SKIP}"
261262
262263
# Compare failing and error tests
263264
for LINE in ${CURRENT_RUN_FAILING}

.github/workflows/freebsd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Run sccache-cache
4242
uses: mozilla-actions/[email protected]
4343
- name: Prepare, build and test
44-
uses: vmactions/[email protected].5
44+
uses: vmactions/[email protected].6
4545
with:
4646
usesh: true
4747
sync: rsync
@@ -135,7 +135,7 @@ jobs:
135135
- name: Run sccache-cache
136136
uses: mozilla-actions/[email protected]
137137
- name: Prepare, build and test
138-
uses: vmactions/[email protected].5
138+
uses: vmactions/[email protected].6
139139
with:
140140
usesh: true
141141
sync: rsync

.github/workflows/fuzzing.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
- { name: fuzz_split, should_pass: false }
5858
- { name: fuzz_tr, should_pass: false }
5959
- { name: fuzz_env, should_pass: false }
60+
- { name: fuzz_cksum, should_pass: false }
6061
- { name: fuzz_parse_glob, should_pass: true }
6162
- { name: fuzz_parse_size, should_pass: true }
6263
- { name: fuzz_parse_time, should_pass: true }

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ bytewise
1010
canonicalization
1111
canonicalize
1212
canonicalizing
13+
capget
1314
codepoint
1415
codepoints
1516
codegen
@@ -65,6 +66,7 @@ kibi
6566
kibibytes
6667
libacl
6768
lcase
69+
llistxattr
6870
lossily
6971
lstat
7072
mebi
@@ -108,6 +110,7 @@ seedable
108110
semver
109111
semiprime
110112
semiprimes
113+
setcap
111114
setfacl
112115
shortcode
113116
shortcodes

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ windows = ["feat_os_windows"]
3434
nightly = []
3535
test_unimplemented = []
3636
expensive_tests = []
37+
# "test_risky_names" == enable tests that create problematic file names (would make a network share inaccessible to Windows, breaks SVN on Mac OS, etc.)
38+
test_risky_names = []
3739
# * only build `uudoc` when `--feature uudoc` is activated
3840
uudoc = ["zip", "dep:uuhelp_parser"]
3941
## features

build.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ pub fn main() {
3333
#[allow(clippy::match_same_arms)]
3434
match krate.as_ref() {
3535
"default" | "macos" | "unix" | "windows" | "selinux" | "zip" => continue, // common/standard feature names
36-
"nightly" | "test_unimplemented" | "expensive_tests" => continue, // crate-local custom features
36+
"nightly" | "test_unimplemented" | "expensive_tests" | "test_risky_names" => {
37+
continue
38+
} // crate-local custom features
3739
"uudoc" => continue, // is not a utility
3840
"test" => continue, // over-ridden with 'uu_test' to avoid collision with rust core crate 'test'
3941
s if s.starts_with(FEATURE_PREFIX) => continue, // crate feature sets

0 commit comments

Comments
 (0)