Skip to content

Commit 2eef402

Browse files
committed
fix: align nightly config logging
Update test scripts to reflect default nightly threads settings and fast-linker opt-out handling while preserving overrides.
1 parent f0b1c74 commit 2eef402

3 files changed

Lines changed: 10 additions & 13 deletions

File tree

scripts/test-all.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,14 @@ SKIPPED=0
1717

1818
platform_test_init
1919
trap platform_cleanup_run_dir EXIT
20-
log_info "Defaults: nightly toolchain uses parallel rustc"
2120
log_info "Opt-out: PLATFORM_DISABLE_NIGHTLY=1"
2221
log_info "Override: PLATFORM_RUST_NIGHTLY=1"
23-
log_info "Defaults: fast linker flags from config"
2422
log_info "Opt-out: PLATFORM_DISABLE_FAST_LINKER=1"
2523
log_info "Override: PLATFORM_FAST_LINKER_RUSTFLAGS/PLATFORM_FAST_LINKER_RUSTFLAGS_DARWIN"
2624
log_info "Override: PLATFORM_LINKER_RUSTFLAGS/PLATFORM_LINKER_RUSTFLAGS_DARWIN"
27-
28-
if [ -z "${PLATFORM_NIGHTLY_RUSTFLAGS+x}" ]; then
29-
export PLATFORM_NIGHTLY_RUSTFLAGS="-Z threads=0"
30-
fi
25+
log_info "Defaults: nightly toolchain uses -Z threads=0"
26+
log_info "Defaults: fast linker flags from config when set"
27+
if [ "${PLATFORM_DISABLE_NIGHTLY:-0}" = "1" ]; then
3128
export PLATFORM_NIGHTLY_RUSTFLAGS=""
3229
log_info "Nightly Rust disabled via opt-out"
3330
elif [ "${PLATFORM_RUST_NIGHTLY:-0}" = "1" ] || [ "${RUSTUP_TOOLCHAIN:-}" = "nightly" ]; then

scripts/test-comprehensive.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,16 @@ log_info " Platform Comprehensive Test Suite"
2424
log_info "============================================================================="
2525
log_info "Artifacts: ${PLATFORM_TEST_ARTIFACTS_DIR}"
2626
log_info "Run dir: ${PLATFORM_TEST_RUN_DIR}"
27-
log_info "Defaults: nightly toolchain uses parallel rustc"
27+
log_info "Defaults: nightly toolchain uses -Z threads=0"
28+
log_info "Defaults: fast linker flags from config when set"
2829
log_info "Opt-out: PLATFORM_DISABLE_NIGHTLY=1"
2930
log_info "Override: PLATFORM_RUST_NIGHTLY=1"
30-
log_info "Defaults: fast linker flags from config"
3131
log_info "Opt-out: PLATFORM_DISABLE_FAST_LINKER=1"
3232
log_info "Override: PLATFORM_FAST_LINKER_RUSTFLAGS/PLATFORM_FAST_LINKER_RUSTFLAGS_DARWIN"
3333
log_info "Override: PLATFORM_LINKER_RUSTFLAGS/PLATFORM_LINKER_RUSTFLAGS_DARWIN"
3434
log_info ""
3535

36-
if [ -z "${PLATFORM_NIGHTLY_RUSTFLAGS+x}" ]; then
37-
export PLATFORM_NIGHTLY_RUSTFLAGS="-Z threads=0"
38-
fi
36+
if [ "${PLATFORM_DISABLE_NIGHTLY:-0}" = "1" ]; then
3937
export PLATFORM_NIGHTLY_RUSTFLAGS=""
4038
log_info "Nightly Rust disabled via opt-out"
4139
elif [ "${PLATFORM_RUST_NIGHTLY:-0}" = "1" ] || [ "${RUSTUP_TOOLCHAIN:-}" = "nightly" ]; then

scripts/verify-nightly-config.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ platform_test_init
1616
trap platform_cleanup_run_dir EXIT
1717

1818
log_info "Nightly config verification"
19-
log_info "Defaults: nightly toolchain uses parallel rustc"
19+
log_info "Defaults: nightly toolchain uses -Z threads=0"
20+
log_info "Defaults: fast linker flags from config when set"
2021
log_info "Opt-out: PLATFORM_DISABLE_NIGHTLY=1"
2122
log_info "Override: PLATFORM_RUST_NIGHTLY=1"
22-
log_info "Defaults: fast linker flags from config"
2323
log_info "Opt-out: PLATFORM_DISABLE_FAST_LINKER=1"
2424
log_info "Override: PLATFORM_FAST_LINKER_RUSTFLAGS/PLATFORM_FAST_LINKER_RUSTFLAGS_DARWIN"
2525
log_info "Override: PLATFORM_LINKER_RUSTFLAGS/PLATFORM_LINKER_RUSTFLAGS_DARWIN"
@@ -37,6 +37,7 @@ run_check() {
3737
PLATFORM_FAST_LINKER_RUSTFLAGS_DARWIN="${PLATFORM_FAST_LINKER_RUSTFLAGS_DARWIN:-}"
3838
PLATFORM_LINKER_RUSTFLAGS="${PLATFORM_LINKER_RUSTFLAGS:-}"
3939
PLATFORM_LINKER_RUSTFLAGS_DARWIN="${PLATFORM_LINKER_RUSTFLAGS_DARWIN:-}"
40+
PLATFORM_DISABLE_FAST_LINKER="${PLATFORM_DISABLE_FAST_LINKER:-0}"
4041

4142
while [ "$#" -gt 0 ]; do
4243
case "$1" in
@@ -86,6 +87,7 @@ run_check() {
8687
export PLATFORM_FAST_LINKER_RUSTFLAGS_DARWIN
8788
export PLATFORM_LINKER_RUSTFLAGS
8889
export PLATFORM_LINKER_RUSTFLAGS_DARWIN
90+
export PLATFORM_DISABLE_FAST_LINKER
8991

9092
log_info "${label}: Running cargo check (dry-run build)"
9193
if cargo check --workspace 2>&1 | tee "${log_file}"; then

0 commit comments

Comments
 (0)