Skip to content

Commit 2b5ec9b

Browse files
committed
redo ./run-test.sh based on MIRI_REPLACE_LIBRS_IF_NOT_TEST
1 parent a0937b2 commit 2b5ec9b

File tree

23 files changed

+26
-203
lines changed

23 files changed

+26
-203
lines changed

Cargo.toml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
[workspace]
22
members = [
3-
"core_miri_test",
4-
"alloc_miri_test",
5-
"std_miri_test",
3+
"library/std",
4+
"library/sysroot",
65
]
76

87
exclude = [
98
# stdarch has its own Cargo workspace
109
"library/stdarch",
11-
"rust-src-patched/library/stdarch",
10+
# this is just a staging ground
11+
"rust-src-patched",
1212
]
13+
14+
[patch.crates-io]
15+
# See comments in `library/rustc-std-workspace-core/README.md` for what's going on
16+
# here
17+
rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
18+
rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
19+
rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }

alloc_miri_test/Cargo.toml

Lines changed: 0 additions & 29 deletions
This file was deleted.

ci-test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,10 @@ std)
8585
echo "::endgroup::"
8686
;;
8787
simd)
88-
cd $MIRI_LIB_SRC/portable-simd
88+
export CARGO_TARGET_DIR=$(pwd)/target
8989
export RUSTFLAGS="-Ainternal_features ${RUSTFLAGS:-}"
9090
export RUSTDOCFLAGS="-Ainternal_features ${RUSTDOCFLAGS:-}"
91+
cd $MIRI_LIB_SRC/portable-simd
9192

9293
echo "::group::Testing portable-simd"
9394
MIRIFLAGS="$DEFAULTFLAGS" \

core_miri_test/Cargo.toml

Lines changed: 0 additions & 31 deletions
This file was deleted.

fake/README.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

fake/alloc/Cargo.toml

Lines changed: 0 additions & 7 deletions
This file was deleted.

fake/alloc/lib.rs

Lines changed: 0 additions & 9 deletions
This file was deleted.

fake/cfg-if/Cargo.toml

Lines changed: 0 additions & 7 deletions
This file was deleted.

fake/cfg-if/lib.rs

Lines changed: 0 additions & 3 deletions
This file was deleted.

fake/core/Cargo.toml

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)