Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 782b869

Browse files
committed
TB: select tests to run both TB and SB
1 parent e243206 commit 782b869

Some content is hidden

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

52 files changed

+116
-5
lines changed

src/tools/miri/tests/compiletest.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,9 @@ regexes! {
139139
STDOUT:
140140
// Windows file paths
141141
r"\\" => "/",
142-
// erase Stacked Borrows tags
142+
// erase borrow tags
143143
"<[0-9]+>" => "<TAG>",
144+
"<[0-9]+=" => "<TAG=",
144145
}
145146

146147
regexes! {
@@ -149,8 +150,9 @@ regexes! {
149150
r"\.rs:[0-9]+:[0-9]+(: [0-9]+:[0-9]+)?" => ".rs:LL:CC",
150151
// erase alloc ids
151152
"alloc[0-9]+" => "ALLOC",
152-
// erase Stacked Borrows tags
153+
// erase borrow tags
153154
"<[0-9]+>" => "<TAG>",
155+
"<[0-9]+=" => "<TAG=",
154156
// erase whitespace that differs between platforms
155157
r" +at (.*\.rs)" => " at $1",
156158
// erase generics in backtraces

src/tools/miri/tests/fail/stacked_borrows/retag_data_race_read.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! Make sure that a retag acts like a write for the data race model.
1+
//! Make sure that a retag acts like a read for the data race model.
22
//@compile-flags: -Zmiri-preemption-rate=0
33
#[derive(Copy, Clone)]
44
struct SendPtr(*mut u8);

src/tools/miri/tests/pass/adjacent-allocs.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@revisions: stack tree
2+
//@[tree]compile-flags: -Zmiri-tree-borrows
13
//@compile-flags: -Zmiri-permissive-provenance
24

35
fn ensure_allocs_can_be_adjacent() {

src/tools/miri/tests/pass/associated-const.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@revisions: stack tree
2+
//@[tree]compile-flags: -Zmiri-tree-borrows
13
trait Foo {
24
const ID: i32;
35
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@revisions: stack tree
2+
//@[tree]compile-flags: -Zmiri-tree-borrows
13
fn main() {
24
vec![()].into_iter();
35
}

src/tools/miri/tests/pass/atomic.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@revisions: stack tree
2+
//@[tree]compile-flags: -Zmiri-tree-borrows
13
//@compile-flags: -Zmiri-strict-provenance
24
#![feature(strict_provenance, strict_provenance_atomic_ptr)]
35
use std::sync::atomic::{
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@revisions: stack tree
2+
//@[tree]compile-flags: -Zmiri-tree-borrows
13
fn main() {
24
assert_eq!(std::thread::available_parallelism().unwrap().get(), 1);
35
}

src/tools/miri/tests/pass/box-custom-alloc.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@revisions: stack tree
2+
//@[tree]compile-flags: -Zmiri-tree-borrows
13
#![allow(incomplete_features)] // for trait upcasting
24
#![feature(allocator_api, trait_upcasting)]
35

src/tools/miri/tests/pass/box.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@revisions: stack tree
2+
//@[tree]compile-flags: -Zmiri-tree-borrows -Zmiri-permissive-provenance
13
#![feature(ptr_internals)]
24

35
fn main() {

0 commit comments

Comments
 (0)