Skip to content

Commit 4dd288c

Browse files
committed
Fix tests
1 parent 0bdc5ff commit 4dd288c

File tree

7 files changed

+51
-17
lines changed

7 files changed

+51
-17
lines changed

build_system/src/test.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,8 @@ fn test_projects(env: &Env, args: &TestArg) -> Result<(), String> {
637637
"https://github.com/BurntSushi/memchr",
638638
"https://github.com/dtolnay/itoa",
639639
"https://github.com/rust-lang/cfg-if",
640-
"https://github.com/rust-lang-nursery/lazy-static.rs",
640+
//"https://github.com/rust-lang-nursery/lazy-static.rs", // TODO: re-enable when the
641+
//failing test is fixed upstream.
641642
//"https://github.com/marshallpierce/rust-base64", // FIXME: one test is OOM-killed.
642643
// TODO: ignore the base64 test that is OOM-killed.
643644
"https://github.com/time-rs/time",

libgccjit.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
341be3b7d7ac6976cfed8ed59da3573c040d0776
1+
bcafd46296f7898dac02d127e441b1d838ef2afc
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
1-
From f6befc4bb51d84f5f1cf35938a168c953d421350 Mon Sep 17 00:00:00 2001
2-
From: bjorn3 <[email protected].com>
3-
Date: Sun, 24 Nov 2019 15:10:23 +0100
1+
From 18793c6109890493ceb3ff36549849a36e3d8022 Mon Sep 17 00:00:00 2001
2+
From: None <none@example.com>
3+
Date: Sun, 1 Sep 2024 11:42:17 -0400
44
Subject: [PATCH] [core] Disable not compiling tests
55

66
---
7-
library/core/tests/Cargo.toml | 8 ++++++++
8-
library/core/tests/num/flt2dec/mod.rs | 1 -
9-
library/core/tests/num/int_macros.rs | 2 ++
10-
library/core/tests/num/uint_macros.rs | 2 ++
11-
library/core/tests/ptr.rs | 2 ++
12-
library/core/tests/slice.rs | 2 ++
13-
6 files changed, 16 insertions(+), 1 deletion(-)
7+
library/core/tests/Cargo.toml | 14 ++++++++++++++
8+
library/core/tests/lib.rs | 1 +
9+
2 files changed, 15 insertions(+)
1410
create mode 100644 library/core/tests/Cargo.toml
1511

1612
diff --git a/library/core/tests/Cargo.toml b/library/core/tests/Cargo.toml
1713
new file mode 100644
18-
index 0000000..46fd999
14+
index 0000000..ca326ac
1915
--- /dev/null
2016
+++ b/library/core/tests/Cargo.toml
21-
@@ -0,0 +1,12 @@
17+
@@ -0,0 +1,14 @@
18+
+[workspace]
19+
+
2220
+[package]
23-
+name = "core"
21+
+name = "coretests"
2422
+version = "0.0.0"
2523
+edition = "2021"
2624
+
@@ -32,12 +30,14 @@ index 0000000..46fd999
3230
+rand = { version = "0.8.5", default-features = false }
3331
+rand_xorshift = { version = "0.3.0", default-features = false }
3432
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
35-
index 42a26ae..5ac1042 100644
33+
index 1e336bf..5800ebb 100644
3634
--- a/library/core/tests/lib.rs
3735
+++ b/library/core/tests/lib.rs
38-
@@ -2,4 +2,5 @@
36+
@@ -1,4 +1,5 @@
3937
// tidy-alphabetical-start
4038
+#![cfg(test)]
4139
#![cfg_attr(bootstrap, feature(offset_of_nested))]
4240
#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))]
4341
#![cfg_attr(test, feature(cfg_match))]
42+
--
43+
2.46.0

src/consts.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ fn check_and_apply_linkage<'gcc, 'tcx>(
386386
cx.declare_global_with_linkage(sym, cx.type_i8(), base::global_linkage_to_gcc(linkage));
387387

388388
if linkage == Linkage::ExternalWeak {
389+
#[cfg(feature = "master")]
389390
global1.add_attribute(VarAttribute::Weak);
390391
}
391392

src/intrinsic/llvm.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -985,6 +985,8 @@ pub fn intrinsic<'gcc, 'tcx>(name: &str, cx: &CodegenCx<'gcc, 'tcx>) -> Function
985985
"llvm.x86.avx512.vpdpbusds.512" => "__builtin_ia32_vpdpbusds_v16si",
986986
"llvm.x86.avx512.vpdpbusds.256" => "__builtin_ia32_vpdpbusds_v8si",
987987
"llvm.x86.avx512.vpdpbusds.128" => "__builtin_ia32_vpdpbusds_v4si",
988+
"llvm.x86.xsave" => "__builtin_ia32_xsave",
989+
"llvm.x86.xsaveopt" => "__builtin_ia32_xsaveopt",
988990

989991
// NOTE: this file is generated by https://github.com/GuillaumeGomez/llvmint/blob/master/generate_list.py
990992
_ => include!("archs.rs"),

tests/failing-ice-tests.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,7 @@ tests/ui/sepcomp/sepcomp-unwind.rs
3434
tests/ui/extern/issue-64655-extern-rust-must-allow-unwind.rs
3535
tests/ui/extern/issue-64655-allow-unwind-when-calling-panic-directly.rs
3636
tests/ui/unwind-no-uwtable.rs
37+
tests/ui/delegation/fn-header.rs
38+
tests/ui/simd/intrinsic/generic-arithmetic-pass.rs
39+
tests/ui/simd/masked-load-store.rs
40+
tests/ui/rfcs/rfc-2632-const-trait-impl/effects/minicore.rs

tests/failing-ui-tests.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,29 @@ tests/ui/simd/intrinsic/generic-arithmetic-pass.rs
9595
tests/ui/backtrace/backtrace.rs
9696
tests/ui/lifetimes/tail-expr-lock-poisoning.rs
9797
tests/ui/runtime/rt-explody-panic-payloads.rs
98+
tests/ui/codegen/equal-pointers-unequal/as-cast/function.rs
99+
tests/ui/codegen/equal-pointers-unequal/as-cast/basic.rs
100+
tests/ui/codegen/equal-pointers-unequal/as-cast/inline1.rs
101+
tests/ui/codegen/equal-pointers-unequal/as-cast/print.rs
102+
tests/ui/codegen/equal-pointers-unequal/as-cast/inline2.rs
103+
tests/ui/codegen/equal-pointers-unequal/as-cast/print3.rs
104+
tests/ui/codegen/equal-pointers-unequal/as-cast/segfault.rs
105+
tests/ui/codegen/equal-pointers-unequal/exposed-provenance/function.rs
106+
tests/ui/codegen/equal-pointers-unequal/exposed-provenance/basic.rs
107+
tests/ui/codegen/equal-pointers-unequal/as-cast/zero.rs
108+
tests/ui/codegen/equal-pointers-unequal/exposed-provenance/inline1.rs
109+
tests/ui/codegen/equal-pointers-unequal/exposed-provenance/print.rs
110+
tests/ui/codegen/equal-pointers-unequal/exposed-provenance/print3.rs
111+
tests/ui/codegen/equal-pointers-unequal/exposed-provenance/inline2.rs
112+
tests/ui/codegen/equal-pointers-unequal/exposed-provenance/segfault.rs
113+
tests/ui/codegen/equal-pointers-unequal/exposed-provenance/zero.rs
114+
tests/ui/codegen/equal-pointers-unequal/strict-provenance/basic.rs
115+
tests/ui/codegen/equal-pointers-unequal/strict-provenance/function.rs
116+
tests/ui/codegen/equal-pointers-unequal/strict-provenance/print.rs
117+
tests/ui/codegen/equal-pointers-unequal/strict-provenance/inline1.rs
118+
tests/ui/codegen/equal-pointers-unequal/strict-provenance/print3.rs
119+
tests/ui/codegen/equal-pointers-unequal/strict-provenance/inline2.rs
120+
tests/ui/codegen/equal-pointers-unequal/strict-provenance/segfault.rs
121+
tests/ui/codegen/equal-pointers-unequal/strict-provenance/zero.rs
122+
tests/ui/sanitizer/cfi-sized-associated-ty.rs
123+
tests/ui/sanitizer/cfi-can-reveal-opaques.rs

0 commit comments

Comments
 (0)