From 64fb96f17e51317f58edc2da565853686e2d097b Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 30 Nov 2023 13:09:37 +0100 Subject: [PATCH] move 'uninit' tests into common directory --- .../tests/fail/{ => uninit}/uninit-after-aggregate-assign.rs | 0 .../fail/{ => uninit}/uninit-after-aggregate-assign.stderr | 0 .../{uninit_buffer.rs => uninit/uninit_alloc_diagnostic.rs} | 1 + .../uninit_alloc_diagnostic.stderr} | 2 +- .../uninit_alloc_diagnostic_with_provenance.rs} | 1 + .../uninit_alloc_diagnostic_with_provenance.stderr} | 2 +- src/tools/miri/tests/fail/{ => uninit}/uninit_byte_read.rs | 0 src/tools/miri/tests/fail/{ => uninit}/uninit_byte_read.stderr | 0 8 files changed, 4 insertions(+), 2 deletions(-) rename src/tools/miri/tests/fail/{ => uninit}/uninit-after-aggregate-assign.rs (100%) rename src/tools/miri/tests/fail/{ => uninit}/uninit-after-aggregate-assign.stderr (100%) rename src/tools/miri/tests/fail/{uninit_buffer.rs => uninit/uninit_alloc_diagnostic.rs} (93%) rename src/tools/miri/tests/fail/{uninit_buffer.stderr => uninit/uninit_alloc_diagnostic.stderr} (97%) rename src/tools/miri/tests/fail/{uninit_buffer_with_provenance.rs => uninit/uninit_alloc_diagnostic_with_provenance.rs} (96%) rename src/tools/miri/tests/fail/{uninit_buffer_with_provenance.stderr => uninit/uninit_alloc_diagnostic_with_provenance.stderr} (96%) rename src/tools/miri/tests/fail/{ => uninit}/uninit_byte_read.rs (100%) rename src/tools/miri/tests/fail/{ => uninit}/uninit_byte_read.stderr (100%) diff --git a/src/tools/miri/tests/fail/uninit-after-aggregate-assign.rs b/src/tools/miri/tests/fail/uninit/uninit-after-aggregate-assign.rs similarity index 100% rename from src/tools/miri/tests/fail/uninit-after-aggregate-assign.rs rename to src/tools/miri/tests/fail/uninit/uninit-after-aggregate-assign.rs diff --git a/src/tools/miri/tests/fail/uninit-after-aggregate-assign.stderr b/src/tools/miri/tests/fail/uninit/uninit-after-aggregate-assign.stderr similarity index 100% rename from src/tools/miri/tests/fail/uninit-after-aggregate-assign.stderr rename to src/tools/miri/tests/fail/uninit/uninit-after-aggregate-assign.stderr diff --git a/src/tools/miri/tests/fail/uninit_buffer.rs b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.rs similarity index 93% rename from src/tools/miri/tests/fail/uninit_buffer.rs rename to src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.rs index d622b2fa7d8..8deaa30d50f 100644 --- a/src/tools/miri/tests/fail/uninit_buffer.rs +++ b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.rs @@ -1,3 +1,4 @@ +//@compile-flags: -Zmiri-disable-validation //@error-in-other-file: memory is uninitialized at [0x4..0x10] #![allow(dropping_copy_types)] diff --git a/src/tools/miri/tests/fail/uninit_buffer.stderr b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.stderr similarity index 97% rename from src/tools/miri/tests/fail/uninit_buffer.stderr rename to src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.stderr index 2d04c0f9be2..cca17a07ec2 100644 --- a/src/tools/miri/tests/fail/uninit_buffer.stderr +++ b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic.stderr @@ -10,7 +10,7 @@ LL | let mut order = unsafe { compare_bytes(left.as_ptr(), right.as_ptr( = note: inside `::compare` at RUSTLIB/core/src/slice/cmp.rs:LL:CC = note: inside `core::slice::cmp::::cmp` at RUSTLIB/core/src/slice/cmp.rs:LL:CC note: inside `main` - --> $DIR/uninit_buffer.rs:LL:CC + --> $DIR/uninit_alloc_diagnostic.rs:LL:CC | LL | drop(slice1.cmp(slice2)); | ^^^^^^^^^^^^^^^^^^ diff --git a/src/tools/miri/tests/fail/uninit_buffer_with_provenance.rs b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.rs similarity index 96% rename from src/tools/miri/tests/fail/uninit_buffer_with_provenance.rs rename to src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.rs index ca825901372..adabff4a2ce 100644 --- a/src/tools/miri/tests/fail/uninit_buffer_with_provenance.rs +++ b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.rs @@ -1,3 +1,4 @@ +//@compile-flags: -Zmiri-disable-validation //@error-in-other-file: memory is uninitialized at [0x4..0x8] //@normalize-stderr-test: "a[0-9]+" -> "ALLOC" #![feature(strict_provenance)] diff --git a/src/tools/miri/tests/fail/uninit_buffer_with_provenance.stderr b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.stderr similarity index 96% rename from src/tools/miri/tests/fail/uninit_buffer_with_provenance.stderr rename to src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.stderr index cd842f0eba5..4dc2d27ead4 100644 --- a/src/tools/miri/tests/fail/uninit_buffer_with_provenance.stderr +++ b/src/tools/miri/tests/fail/uninit/uninit_alloc_diagnostic_with_provenance.stderr @@ -10,7 +10,7 @@ LL | let mut order = unsafe { compare_bytes(left.as_ptr(), right.as_ptr( = note: inside `::compare` at RUSTLIB/core/src/slice/cmp.rs:LL:CC = note: inside `core::slice::cmp::::cmp` at RUSTLIB/core/src/slice/cmp.rs:LL:CC note: inside `main` - --> $DIR/uninit_buffer_with_provenance.rs:LL:CC + --> $DIR/uninit_alloc_diagnostic_with_provenance.rs:LL:CC | LL | drop(slice1.cmp(slice2)); | ^^^^^^^^^^^^^^^^^^ diff --git a/src/tools/miri/tests/fail/uninit_byte_read.rs b/src/tools/miri/tests/fail/uninit/uninit_byte_read.rs similarity index 100% rename from src/tools/miri/tests/fail/uninit_byte_read.rs rename to src/tools/miri/tests/fail/uninit/uninit_byte_read.rs diff --git a/src/tools/miri/tests/fail/uninit_byte_read.stderr b/src/tools/miri/tests/fail/uninit/uninit_byte_read.stderr similarity index 100% rename from src/tools/miri/tests/fail/uninit_byte_read.stderr rename to src/tools/miri/tests/fail/uninit/uninit_byte_read.stderr