Skip to content

Commit 996d570

Browse files
committed
Fix cg_clif testing coretests
1 parent 869ca6a commit 996d570

4 files changed

+11
-56
lines changed

build_system/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ const EXTENDED_SYSROOT_SUITE: &[TestCase] = &[
151151
apply_patches(
152152
&runner.dirs,
153153
"coretests",
154-
&runner.stdlib_source.join("library/core/tests"),
154+
&runner.stdlib_source.join("library/coretests"),
155155
&LIBCORE_TESTS_SRC.to_path(&runner.dirs),
156156
);
157157

patches/0022-coretests-Disable-not-compiling-tests.patch

-44
This file was deleted.

patches/0027-coretests-128bit-atomic-operations.patch

+7-8
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,20 @@ Cranelift doesn't support them yet
1010
library/core/tests/atomic.rs | 4 ---
1111
4 files changed, 4 insertions(+), 50 deletions(-)
1212

13-
diff --git a/lib.rs b/lib.rs
13+
diff --git a/tests/lib.rs b/tests/lib.rs
1414
index 1e336bf..35e6f54 100644
15-
--- a/lib.rs
16-
+++ b/lib.rs
17-
@@ -2,6 +2,5 @@
18-
#![cfg(test)]
15+
--- a/tests/lib.rs
16+
+++ b/tests/lib.rs
17+
@@ -2,5 +2,4 @@
1918
// tidy-alphabetical-start
2019
-#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))]
2120
#![cfg_attr(test, feature(cfg_match))]
2221
#![feature(alloc_layout_extra)]
2322
#![feature(array_chunks)]
24-
diff --git a/atomic.rs b/atomic.rs
23+
diff --git a/tests/atomic.rs b/tests/atomic.rs
2524
index b735957..ea728b6 100644
26-
--- a/atomic.rs
27-
+++ b/atomic.rs
25+
--- a/tests/atomic.rs
26+
+++ b/tests/atomic.rs
2827
@@ -185,10 +185,6 @@ fn atomic_alignment() {
2928
assert_eq!(align_of::<AtomicU64>(), size_of::<AtomicU64>());
3029
#[cfg(target_has_atomic = "64")]

patches/0028-coretests-Disable-long-running-tests.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Subject: [PATCH] Disable long running tests
77
library/core/tests/slice.rs | 2 ++
88
1 file changed, 2 insertions(+)
99

10-
diff --git a/slice.rs b/slice.rs
10+
diff --git a/tests/slice.rs b/tests/slice.rs
1111
index 8402833..84592e0 100644
12-
--- a/slice.rs
13-
+++ b/slice.rs
12+
--- a/tests/slice.rs
13+
+++ b/tests/slice.rs
1414
@@ -1809,6 +1809,7 @@ fn sort_unstable() {
1515
}
1616
}

0 commit comments

Comments
 (0)