Skip to content

Commit cf8c29a

Browse files
bjorn3bjorn3
committed
Move all alloc integration tests to a new alloctests crate
1 parent dfca153 commit cf8c29a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+58
-19
lines changed

‎Cargo.lock

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ members = [
44
"std",
55
"sysroot",
66
"coretests",
7+
"alloctests",
78
]
89

910
exclude = [

‎alloc/Cargo.toml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,6 @@ compiler_builtins = { version = "=0.1.151", features = ['rustc-dep-of-std'] }
1818
rand = { version = "0.9.0", default-features = false, features = ["alloc"] }
1919
rand_xorshift = "0.4.0"
2020

21-
[[test]]
22-
name = "alloctests"
23-
path = "tests/lib.rs"
24-
25-
[[test]]
26-
name = "vec_deque_alloc_error"
27-
path = "tests/vec_deque_alloc_error.rs"
28-
29-
[[bench]]
30-
name = "allocbenches"
31-
path = "benches/lib.rs"
32-
test = true
33-
34-
[[bench]]
35-
name = "vec_deque_append_bench"
36-
path = "benches/vec_deque_append.rs"
37-
harness = false
38-
3921
[features]
4022
compiler-builtins-mem = ['compiler_builtins/mem']
4123
compiler-builtins-c = ["compiler_builtins/c"]

‎alloc/src/raw_vec.rs renamed to ‎alloc/src/raw_vec/mod.rs

File renamed without changes.

‎alloc/src/rc.rs renamed to ‎alloc/src/rc/mod.rs

File renamed without changes.

‎alloctests/Cargo.toml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
[package]
2+
name = "alloctests"
3+
version = "0.0.0"
4+
license = "MIT OR Apache-2.0"
5+
repository = "https://github.com/rust-lang/rust.git"
6+
description = "Tests for the Rust Allocation Library"
7+
autotests = false
8+
autobenches = false
9+
edition = "2021"
10+
11+
[lib]
12+
path = "lib.rs"
13+
test = false
14+
bench = false
15+
16+
[dev-dependencies]
17+
rand = { version = "0.9.0", default-features = false, features = ["alloc"] }
18+
rand_xorshift = "0.4.0"
19+
20+
[[test]]
21+
name = "alloctests"
22+
path = "tests/lib.rs"
23+
24+
[[test]]
25+
name = "vec_deque_alloc_error"
26+
path = "tests/vec_deque_alloc_error.rs"
27+
28+
[[bench]]
29+
name = "allocbenches"
30+
path = "benches/lib.rs"
31+
test = true
32+
33+
[[bench]]
34+
name = "vec_deque_append_bench"
35+
path = "benches/vec_deque_append.rs"
36+
harness = false
37+
38+
[lints.rust.unexpected_cfgs]
39+
level = "warn"
40+
check-cfg = [
41+
'cfg(bootstrap)',
42+
'cfg(no_global_oom_handling)',
43+
'cfg(no_rc)',
44+
'cfg(no_sync)',
45+
'cfg(randomized_layouts)',
46+
]

‎alloc/benches/binary_heap.rs renamed to ‎alloctests/benches/binary_heap.rs

File renamed without changes.

‎alloc/benches/btree/map.rs renamed to ‎alloctests/benches/btree/map.rs

File renamed without changes.

‎alloc/benches/btree/mod.rs renamed to ‎alloctests/benches/btree/mod.rs

File renamed without changes.

‎alloc/benches/btree/set.rs renamed to ‎alloctests/benches/btree/set.rs

File renamed without changes.

‎alloc/benches/lib.rs renamed to ‎alloctests/benches/lib.rs

File renamed without changes.

‎alloc/benches/linked_list.rs renamed to ‎alloctests/benches/linked_list.rs

File renamed without changes.

‎alloc/benches/slice.rs renamed to ‎alloctests/benches/slice.rs

File renamed without changes.

‎alloc/benches/str.rs renamed to ‎alloctests/benches/str.rs

File renamed without changes.

‎alloc/benches/string.rs renamed to ‎alloctests/benches/string.rs

File renamed without changes.

‎alloc/benches/vec.rs renamed to ‎alloctests/benches/vec.rs

File renamed without changes.

‎alloc/benches/vec_deque.rs renamed to ‎alloctests/benches/vec_deque.rs

File renamed without changes.

‎alloc/benches/vec_deque_append.rs renamed to ‎alloctests/benches/vec_deque_append.rs

File renamed without changes.

‎alloctests/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// Intentionally left empty.

‎alloc/tests/alloc.rs renamed to ‎alloctests/tests/alloc_test.rs

File renamed without changes.

‎alloc/tests/arc.rs renamed to ‎alloctests/tests/arc.rs

File renamed without changes.

‎alloc/tests/autotraits.rs renamed to ‎alloctests/tests/autotraits.rs

File renamed without changes.

‎alloc/tests/borrow.rs renamed to ‎alloctests/tests/borrow.rs

File renamed without changes.

‎alloc/tests/boxed.rs renamed to ‎alloctests/tests/boxed.rs

File renamed without changes.

‎alloc/tests/btree_set_hash.rs renamed to ‎alloctests/tests/btree_set_hash.rs

File renamed without changes.

‎alloc/tests/c_str.rs renamed to ‎alloctests/tests/c_str.rs

File renamed without changes.

‎alloc/tests/c_str2.rs renamed to ‎alloctests/tests/c_str2.rs

File renamed without changes.

‎alloc/tests/collections/binary_heap.rs renamed to ‎alloctests/tests/collections/binary_heap.rs

File renamed without changes.

‎alloc/tests/collections/mod.rs renamed to ‎alloctests/tests/collections/mod.rs

File renamed without changes.

‎alloc/tests/const_fns.rs renamed to ‎alloctests/tests/const_fns.rs

File renamed without changes.

‎alloc/tests/cow_str.rs renamed to ‎alloctests/tests/cow_str.rs

File renamed without changes.

‎alloc/tests/fmt.rs renamed to ‎alloctests/tests/fmt.rs

File renamed without changes.

‎alloc/tests/heap.rs renamed to ‎alloctests/tests/heap.rs

File renamed without changes.

‎alloc/tests/lib.rs renamed to ‎alloctests/tests/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,12 @@
4343
#![deny(fuzzy_provenance_casts)]
4444
#![deny(unsafe_op_in_unsafe_fn)]
4545

46+
extern crate alloc;
4647
extern crate test;
4748

4849
use std::hash::{DefaultHasher, Hash, Hasher};
4950

50-
mod alloc;
51+
mod alloc_test;
5152
mod arc;
5253
mod autotraits;
5354
mod borrow;

‎alloc/tests/linked_list.rs renamed to ‎alloctests/tests/linked_list.rs

File renamed without changes.

‎alloc/tests/misc_tests.rs renamed to ‎alloctests/tests/misc_tests.rs

File renamed without changes.

‎alloc/tests/rc.rs renamed to ‎alloctests/tests/rc.rs

File renamed without changes.

‎alloc/tests/slice.rs renamed to ‎alloctests/tests/slice.rs

File renamed without changes.

‎alloc/tests/sort/ffi_types.rs renamed to ‎alloctests/tests/sort/ffi_types.rs

File renamed without changes.

‎alloc/tests/sort/known_good_stable_sort.rs renamed to ‎alloctests/tests/sort/known_good_stable_sort.rs

File renamed without changes.

‎alloc/tests/sort/mod.rs renamed to ‎alloctests/tests/sort/mod.rs

File renamed without changes.

‎alloc/tests/sort/patterns.rs renamed to ‎alloctests/tests/sort/patterns.rs

File renamed without changes.

‎alloc/tests/sort/tests.rs renamed to ‎alloctests/tests/sort/tests.rs

File renamed without changes.

‎alloc/tests/sort/zipf.rs renamed to ‎alloctests/tests/sort/zipf.rs

File renamed without changes.

‎alloc/tests/str.rs renamed to ‎alloctests/tests/str.rs

File renamed without changes.

‎alloc/tests/string.rs renamed to ‎alloctests/tests/string.rs

File renamed without changes.

‎alloc/tests/sync.rs renamed to ‎alloctests/tests/sync.rs

File renamed without changes.

‎alloc/tests/task.rs renamed to ‎alloctests/tests/task.rs

File renamed without changes.

‎alloc/tests/testing/crash_test.rs renamed to ‎alloctests/tests/testing/crash_test.rs

File renamed without changes.

‎alloc/tests/testing/mod.rs renamed to ‎alloctests/tests/testing/mod.rs

File renamed without changes.

‎alloc/tests/thin_box.rs renamed to ‎alloctests/tests/thin_box.rs

File renamed without changes.

‎alloc/tests/vec.rs renamed to ‎alloctests/tests/vec.rs

File renamed without changes.

‎alloc/tests/vec_deque.rs renamed to ‎alloctests/tests/vec_deque.rs

File renamed without changes.

‎alloc/tests/vec_deque_alloc_error.rs renamed to ‎alloctests/tests/vec_deque_alloc_error.rs

File renamed without changes.

0 commit comments

Comments
 (0)