Skip to content

Commit 7c651f4

Browse files
committed
ci: update fuzz CI job to reorder tests
Just runs `./generate-files.sh` after tweaking it to sort the list. Otherwise my local CI chokes on the inconsistency between different 'find' orderings.
1 parent aaf276c commit 7c651f4

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed

.github/workflows/fuzz.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
fuzz_target: [
19-
roundtrip_semantic,
19+
compile_descriptor,
2020
parse_descriptor,
2121
parse_descriptor_secret,
22+
roundtrip_concrete,
23+
roundtrip_descriptor,
2224
roundtrip_miniscript_script,
2325
roundtrip_miniscript_str,
24-
roundtrip_descriptor,
25-
roundtrip_concrete,
26-
compile_descriptor,
26+
roundtrip_semantic,
2727
]
2828
steps:
2929
- name: Install test dependencies

fuzz/Cargo.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ miniscript = { path = "..", features = [ "compiler" ] }
1515
regex = "1.0"
1616

1717
[[bin]]
18-
name = "roundtrip_semantic"
19-
path = "fuzz_targets/roundtrip_semantic.rs"
18+
name = "compile_descriptor"
19+
path = "fuzz_targets/compile_descriptor.rs"
2020

2121
[[bin]]
2222
name = "parse_descriptor"
@@ -27,21 +27,21 @@ name = "parse_descriptor_secret"
2727
path = "fuzz_targets/parse_descriptor_secret.rs"
2828

2929
[[bin]]
30-
name = "roundtrip_miniscript_script"
31-
path = "fuzz_targets/roundtrip_miniscript_script.rs"
32-
33-
[[bin]]
34-
name = "roundtrip_miniscript_str"
35-
path = "fuzz_targets/roundtrip_miniscript_str.rs"
30+
name = "roundtrip_concrete"
31+
path = "fuzz_targets/roundtrip_concrete.rs"
3632

3733
[[bin]]
3834
name = "roundtrip_descriptor"
3935
path = "fuzz_targets/roundtrip_descriptor.rs"
4036

4137
[[bin]]
42-
name = "roundtrip_concrete"
43-
path = "fuzz_targets/roundtrip_concrete.rs"
38+
name = "roundtrip_miniscript_script"
39+
path = "fuzz_targets/roundtrip_miniscript_script.rs"
4440

4541
[[bin]]
46-
name = "compile_descriptor"
47-
path = "fuzz_targets/compile_descriptor.rs"
42+
name = "roundtrip_miniscript_str"
43+
path = "fuzz_targets/roundtrip_miniscript_str.rs"
44+
45+
[[bin]]
46+
name = "roundtrip_semantic"
47+
path = "fuzz_targets/roundtrip_semantic.rs"

fuzz/fuzz-util.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22

33
REPO_DIR=$(git rev-parse --show-toplevel)
44

5+
# Sort order is effected by locale. See `man sort`.
6+
# > Set LC_ALL=C to get the traditional sort order that uses native byte values.
7+
export LC_ALL=C
8+
59
listTargetFiles() {
610
pushd "$REPO_DIR/fuzz" > /dev/null || exit 1
7-
find fuzz_targets/ -type f -name "*.rs"
11+
find fuzz_targets/ -type f -name "*.rs" | sort
812
popd > /dev/null || exit 1
913
}
1014

0 commit comments

Comments
 (0)