Skip to content

Commit 897e60a

Browse files
committed
Add remaining libm crates to the workspace
These are still not yet covered in CI since we always name explicit packages there, but all crates are now part of the workspace.
1 parent a5ba95e commit 897e60a

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

Cargo.toml

+4-6
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,18 @@ members = [
44
"builtins-test",
55
"compiler-builtins",
66
"crates/libm-macros",
7+
"crates/musl-math-sys",
8+
"crates/util",
79
"libm",
8-
# FIXME(libm): disabled until tests work in CI
9-
# "libm-test",
10-
# "crates/musl-math-sys",
11-
# "crates/util",
10+
"libm-test",
1211
]
1312

1413
default-members = [
1514
"builtins-test",
1615
"compiler-builtins",
1716
"crates/libm-macros",
18-
# FIXME(libm): disabled until tests work in CI
19-
# "crates/libm-test"
2017
"libm",
18+
"libm-test",
2119
]
2220

2321
exclude = [

ci/run.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ update_rlib_paths() {
5858
update_rlib_paths
5959
rm -f "${rlib_paths[@]}"
6060

61-
cargo build --target "$target"
62-
cargo build --target "$target" --release
63-
cargo build --target "$target" --features c
64-
cargo build --target "$target" --release --features c
65-
cargo build --target "$target" --features no-asm
66-
cargo build --target "$target" --release --features no-asm
67-
cargo build --target "$target" --features no-f16-f128
68-
cargo build --target "$target" --release --features no-f16-f128
61+
cargo build -p compiler_builtins --target "$target"
62+
cargo build -p compiler_builtins --target "$target" --release
63+
cargo build -p compiler_builtins --target "$target" --features c
64+
cargo build -p compiler_builtins --target "$target" --release --features c
65+
cargo build -p compiler_builtins --target "$target" --features no-asm
66+
cargo build -p compiler_builtins --target "$target" --release --features no-asm
67+
cargo build -p compiler_builtins --target "$target" --features no-f16-f128
68+
cargo build -p compiler_builtins --target "$target" --release --features no-f16-f128
6969

7070
PREFIX=${target//unknown-/}-
7171
case "$target" in

libm-test/tests/check_coverage.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ macro_rules! callback {
1919

2020
#[test]
2121
fn test_for_each_function_all_included() {
22-
let all_functions: HashSet<_> = include_str!("../../../etc/function-list.txt")
22+
let all_functions: HashSet<_> = include_str!("../../etc/function-list.txt")
2323
.lines()
2424
.filter(|line| !line.starts_with("#"))
2525
.collect();
@@ -52,7 +52,7 @@ fn ensure_list_updated() {
5252
}
5353

5454
let res = Command::new("python3")
55-
.arg(Path::new(env!("CARGO_MANIFEST_DIR")).join("../../etc/update-api-list.py"))
55+
.arg(Path::new(env!("CARGO_MANIFEST_DIR")).join("../etc/update-api-list.py"))
5656
.arg("--check")
5757
.status()
5858
.unwrap();

0 commit comments

Comments
 (0)