Skip to content

Commit e5f4d5d

Browse files
committed
ci: musl_time64: ensure correct testing
1 parent 350bad0 commit e5f4d5d

5 files changed

+92
-0
lines changed

ci/run-docker.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ run() {
4545
--env LIBC_CI_ZBUILD_STD \
4646
--env RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS \
4747
--env RUST_LIBC_UNSTABLE_GNU_TIME_BITS \
48+
--env RUST_LIBC_UNSTABLE_MUSL_V1_2_3 \
49+
--env RUST_LIBC_UNSTABLE_MUSL_TIME64 \
4850
--env CARGO_HOME=/cargo \
4951
--env CARGO_TARGET_DIR=/checkout/target \
5052
--volume "$CARGO_HOME":/cargo \

ci/verify-build.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,15 @@ test_target() {
8181
# Test with the equivalent of _TIME_BITS=64
8282
RUST_LIBC_UNSTABLE_GNU_TIME_BITS=64 $cmd
8383
;;
84+
arm*-*-musl*|i*86-*-musl|powerpc-*-musl*|mips-*-musl|mipsel-*-musl)
85+
# Test with new musl changes and the equivalent of _REDIR_TIME64
86+
RUST_LIBC_UNSTABLE_MUSL_V1_2_3=1 \
87+
RUST_LIBC_UNSTABLE_MUSL_TIME64=1 $cmd
88+
;;
89+
*musl*)
90+
# Test with the new musl changes.
91+
RUST_LIBC_UNSTABLE_MUSL_V1_2_3=1 $cmd
92+
;;
8493
esac
8594
fi
8695

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
thread 'rustc' panicked at compiler/rustc_middle/src/query/on_disk_cache.rs:511:5:
2+
assertion `left == right` failed
3+
left: 0
4+
right: 1002111927320821928687967599834759150
5+
stack backtrace:
6+
0: 0x7ffa57159785 - <unknown>
7+
1: 0x7ffa571596d5 - std::backtrace::Backtrace::force_capture::hef0840345d34355a
8+
2: 0x7ffa5489b1ce - <unknown>
9+
3: 0x7ffa57176833 - std::panicking::rust_panic_with_hook::h402df430f77b139b
10+
4: 0x7ffa5717650a - <unknown>
11+
5: 0x7ffa57173a89 - std::sys::backtrace::__rust_end_short_backtrace::hd6ee186b09085420
12+
6: 0x7ffa571761cf - rust_begin_unwind
13+
7: 0x7ffa5394e480 - core::panicking::panic_fmt::h250731373fbf7c0c
14+
8: 0x7ffa5394e8fa - core::panicking::assert_failed_inner::h0b63c78fb2eab9e0
15+
9: 0x7ffa55988747 - core[1da3e9e537ec24d4]::panicking::assert_failed::<u128, u128>
16+
10: 0x7ffa5596522c - <rustc_middle[d6b0322ea3151aaa]::query::on_disk_cache::OnDiskCache>::new
17+
11: 0x7ffa551dbd52 - rustc_incremental[539479ebccffad45]::persist::load::load_query_result_cache
18+
12: 0x7ffa547c8a7b - <unknown>
19+
13: 0x7ffa5487f596 - <unknown>
20+
14: 0x7ffa54815a97 - <unknown>
21+
15: 0x7ffa54830651 - std[6956e2ccddace8c]::sys::backtrace::__rust_begin_short_backtrace::<rustc_interface[8bbda2bbdfb85682]::util::run_in_thread_with_globals<rustc_interface[8bbda2bbdfb85682]::util::run_in_thread_pool_with_globals<rustc_interface[8bbda2bbdfb85682]::interface::run_compiler<(), rustc_driver_impl[a38dd6409c8212bc]::run_compiler::{closure#0}>::{closure#1}, ()>::{closure#0}, ()>::{closure#0}::{closure#0}, ()>
22+
16: 0x7ffa54832693 - <unknown>
23+
17: 0x7ffa5718212b - <unknown>
24+
25+
26+
rustc version: 1.86.0-nightly (05f9846f8 2025-03-31) (gentoo)
27+
platform: x86_64-unknown-linux-musl
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
thread 'rustc' panicked at compiler/rustc_middle/src/query/on_disk_cache.rs:511:5:
2+
assertion `left == right` failed
3+
left: 0
4+
right: 1002111927320821928687967599834759150
5+
stack backtrace:
6+
0: 0x7f0738b59785 - <unknown>
7+
1: 0x7f0738b596d5 - std::backtrace::Backtrace::force_capture::hef0840345d34355a
8+
2: 0x7f073629b1ce - <unknown>
9+
3: 0x7f0738b76833 - std::panicking::rust_panic_with_hook::h402df430f77b139b
10+
4: 0x7f0738b7650a - <unknown>
11+
5: 0x7f0738b73a89 - std::sys::backtrace::__rust_end_short_backtrace::hd6ee186b09085420
12+
6: 0x7f0738b761cf - rust_begin_unwind
13+
7: 0x7f073534e480 - core::panicking::panic_fmt::h250731373fbf7c0c
14+
8: 0x7f073534e8fa - core::panicking::assert_failed_inner::h0b63c78fb2eab9e0
15+
9: 0x7f0737388747 - core[1da3e9e537ec24d4]::panicking::assert_failed::<u128, u128>
16+
10: 0x7f073736522c - <rustc_middle[d6b0322ea3151aaa]::query::on_disk_cache::OnDiskCache>::new
17+
11: 0x7f0736bdbd52 - rustc_incremental[539479ebccffad45]::persist::load::load_query_result_cache
18+
12: 0x7f07361c8a7b - <unknown>
19+
13: 0x7f073627f596 - <unknown>
20+
14: 0x7f0736215a97 - <unknown>
21+
15: 0x7f0736230651 - std[6956e2ccddace8c]::sys::backtrace::__rust_begin_short_backtrace::<rustc_interface[8bbda2bbdfb85682]::util::run_in_thread_with_globals<rustc_interface[8bbda2bbdfb85682]::util::run_in_thread_pool_with_globals<rustc_interface[8bbda2bbdfb85682]::interface::run_compiler<(), rustc_driver_impl[a38dd6409c8212bc]::run_compiler::{closure#0}>::{closure#1}, ()>::{closure#0}, ()>::{closure#0}::{closure#0}, ()>
22+
16: 0x7f0736232693 - <unknown>
23+
17: 0x7f0738b8212b - <unknown>
24+
25+
26+
rustc version: 1.86.0-nightly (05f9846f8 2025-03-31) (gentoo)
27+
platform: x86_64-unknown-linux-musl
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
thread 'rustc' panicked at compiler/rustc_middle/src/query/on_disk_cache.rs:511:5:
2+
assertion `left == right` failed
3+
left: 0
4+
right: 1002111927320821928687967599834759150
5+
stack backtrace:
6+
0: 0x7fe5ecd59785 - <unknown>
7+
1: 0x7fe5ecd596d5 - std::backtrace::Backtrace::force_capture::hef0840345d34355a
8+
2: 0x7fe5ea49b1ce - <unknown>
9+
3: 0x7fe5ecd76833 - std::panicking::rust_panic_with_hook::h402df430f77b139b
10+
4: 0x7fe5ecd7650a - <unknown>
11+
5: 0x7fe5ecd73a89 - std::sys::backtrace::__rust_end_short_backtrace::hd6ee186b09085420
12+
6: 0x7fe5ecd761cf - rust_begin_unwind
13+
7: 0x7fe5e954e480 - core::panicking::panic_fmt::h250731373fbf7c0c
14+
8: 0x7fe5e954e8fa - core::panicking::assert_failed_inner::h0b63c78fb2eab9e0
15+
9: 0x7fe5eb588747 - core[1da3e9e537ec24d4]::panicking::assert_failed::<u128, u128>
16+
10: 0x7fe5eb56522c - <rustc_middle[d6b0322ea3151aaa]::query::on_disk_cache::OnDiskCache>::new
17+
11: 0x7fe5eaddbd52 - rustc_incremental[539479ebccffad45]::persist::load::load_query_result_cache
18+
12: 0x7fe5ea3c8a7b - <unknown>
19+
13: 0x7fe5ea47f596 - <unknown>
20+
14: 0x7fe5ea415a97 - <unknown>
21+
15: 0x7fe5ea430651 - std[6956e2ccddace8c]::sys::backtrace::__rust_begin_short_backtrace::<rustc_interface[8bbda2bbdfb85682]::util::run_in_thread_with_globals<rustc_interface[8bbda2bbdfb85682]::util::run_in_thread_pool_with_globals<rustc_interface[8bbda2bbdfb85682]::interface::run_compiler<(), rustc_driver_impl[a38dd6409c8212bc]::run_compiler::{closure#0}>::{closure#1}, ()>::{closure#0}, ()>::{closure#0}::{closure#0}, ()>
22+
16: 0x7fe5ea432693 - <unknown>
23+
17: 0x7fe5ecd8212b - <unknown>
24+
25+
26+
rustc version: 1.86.0-nightly (05f9846f8 2025-03-31) (gentoo)
27+
platform: x86_64-unknown-linux-musl

0 commit comments

Comments
 (0)