about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBen Kimock <kimockb@gmail.com>2022-10-15 19:19:12 -0400
committerBen Kimock <kimockb@gmail.com>2022-10-15 19:19:12 -0400
commitd287a0be79bc696523bf33d8159204ae4cc588ca (patch)
tree4268dd054f3bbd90a14fd39101b3858ec8226a1e
parent26186d7ff247b74287f21dfebcd08d0d5e0152aa (diff)
downloadrust-d287a0be79bc696523bf33d8159204ae4cc588ca.tar.gz
rust-d287a0be79bc696523bf33d8159204ae4cc588ca.zip
Replace tags in stdout
-rw-r--r--src/tools/miri/tests/compiletest.rs2
-rw-r--r--src/tools/miri/tests/pass/stacked-borrows/stack-printing.stdout10
2 files changed, 7 insertions, 5 deletions
diff --git a/src/tools/miri/tests/compiletest.rs b/src/tools/miri/tests/compiletest.rs
index 4789d22eb4f..46c78df30b1 100644
--- a/src/tools/miri/tests/compiletest.rs
+++ b/src/tools/miri/tests/compiletest.rs
@@ -138,6 +138,8 @@ regexes! {
     STDOUT:
     // Windows file paths
     r"\\"                           => "/",
+    // erase Stacked Borrows tags
+    "<[0-9]+>"                      => "<TAG>",
 }
 
 regexes! {
diff --git a/src/tools/miri/tests/pass/stacked-borrows/stack-printing.stdout b/src/tools/miri/tests/pass/stacked-borrows/stack-printing.stdout
index 6d4f15453d2..660ee71e6f5 100644
--- a/src/tools/miri/tests/pass/stacked-borrows/stack-printing.stdout
+++ b/src/tools/miri/tests/pass/stacked-borrows/stack-printing.stdout
@@ -1,5 +1,5 @@
-0..1: [ SharedReadWrite<2794> ]
-0..1: [ SharedReadWrite<2794> ]
-0..1: [ SharedReadWrite<2794> ]
-0..1: [ SharedReadWrite<2794> Unique<2822> Unique<2823> Unique<2824> Unique<2828> Unique<2830> ]
-0..1: [ SharedReadWrite<2794> Disabled<2822> Disabled<2823> Disabled<2824> Disabled<2828> Disabled<2830> SharedReadOnly<2832> ]
+0..1: [ SharedReadWrite<TAG> ]
+0..1: [ SharedReadWrite<TAG> ]
+0..1: [ SharedReadWrite<TAG> ]
+0..1: [ SharedReadWrite<TAG> Unique<TAG> Unique<TAG> Unique<TAG> Unique<TAG> Unique<TAG> ]
+0..1: [ SharedReadWrite<TAG> Disabled<TAG> Disabled<TAG> Disabled<TAG> Disabled<TAG> Disabled<TAG> SharedReadOnly<TAG> ]