From a0c8b09cf887ade10bcc5b2a06b32304af3cebbe Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 30 Nov 2023 13:11:17 +0100 Subject: [PATCH] move some validity-related tests into subdir --- .../fail/{invalid_bool.rs => validity/invalid_bool_op.rs} | 0 .../{invalid_bool.stderr => validity/invalid_bool_op.stderr} | 4 ++-- .../fail/{invalid_char.rs => validity/invalid_char_op.rs} | 0 .../{invalid_char.stderr => validity/invalid_char_op.stderr} | 4 ++-- .../fail/{invalid_enum_tag.rs => validity/invalid_enum_op.rs} | 0 .../invalid_enum_op.stderr} | 4 ++-- .../tests/fail/{invalid_int.rs => validity/invalid_int_op.rs} | 0 .../{invalid_int.stderr => validity/invalid_int_op.stderr} | 4 ++-- 8 files changed, 8 insertions(+), 8 deletions(-) rename src/tools/miri/tests/fail/{invalid_bool.rs => validity/invalid_bool_op.rs} (100%) rename src/tools/miri/tests/fail/{invalid_bool.stderr => validity/invalid_bool_op.stderr} (87%) rename src/tools/miri/tests/fail/{invalid_char.rs => validity/invalid_char_op.rs} (100%) rename src/tools/miri/tests/fail/{invalid_char.stderr => validity/invalid_char_op.stderr} (86%) rename src/tools/miri/tests/fail/{invalid_enum_tag.rs => validity/invalid_enum_op.rs} (100%) rename src/tools/miri/tests/fail/{invalid_enum_tag.stderr => validity/invalid_enum_op.stderr} (85%) rename src/tools/miri/tests/fail/{invalid_int.rs => validity/invalid_int_op.rs} (100%) rename src/tools/miri/tests/fail/{invalid_int.stderr => validity/invalid_int_op.stderr} (88%) diff --git a/src/tools/miri/tests/fail/invalid_bool.rs b/src/tools/miri/tests/fail/validity/invalid_bool_op.rs similarity index 100% rename from src/tools/miri/tests/fail/invalid_bool.rs rename to src/tools/miri/tests/fail/validity/invalid_bool_op.rs diff --git a/src/tools/miri/tests/fail/invalid_bool.stderr b/src/tools/miri/tests/fail/validity/invalid_bool_op.stderr similarity index 87% rename from src/tools/miri/tests/fail/invalid_bool.stderr rename to src/tools/miri/tests/fail/validity/invalid_bool_op.stderr index fd1ea5087b2e..b938d29e760a 100644 --- a/src/tools/miri/tests/fail/invalid_bool.stderr +++ b/src/tools/miri/tests/fail/validity/invalid_bool_op.stderr @@ -1,5 +1,5 @@ error: Undefined Behavior: interpreting an invalid 8-bit value as a bool: 0x02 - --> $DIR/invalid_bool.rs:LL:CC + --> $DIR/invalid_bool_op.rs:LL:CC | LL | let _x = b == std::hint::black_box(true); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ interpreting an invalid 8-bit value as a bool: 0x02 @@ -7,7 +7,7 @@ LL | let _x = b == std::hint::black_box(true); = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information = note: BACKTRACE: - = note: inside `main` at $DIR/invalid_bool.rs:LL:CC + = note: inside `main` at $DIR/invalid_bool_op.rs:LL:CC note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace diff --git a/src/tools/miri/tests/fail/invalid_char.rs b/src/tools/miri/tests/fail/validity/invalid_char_op.rs similarity index 100% rename from src/tools/miri/tests/fail/invalid_char.rs rename to src/tools/miri/tests/fail/validity/invalid_char_op.rs diff --git a/src/tools/miri/tests/fail/invalid_char.stderr b/src/tools/miri/tests/fail/validity/invalid_char_op.stderr similarity index 86% rename from src/tools/miri/tests/fail/invalid_char.stderr rename to src/tools/miri/tests/fail/validity/invalid_char_op.stderr index 81d6cdad1572..113eecd9cf7a 100644 --- a/src/tools/miri/tests/fail/invalid_char.stderr +++ b/src/tools/miri/tests/fail/validity/invalid_char_op.stderr @@ -1,5 +1,5 @@ error: Undefined Behavior: interpreting an invalid 32-bit value as a char: $HEX - --> $DIR/invalid_char.rs:LL:CC + --> $DIR/invalid_char_op.rs:LL:CC | LL | let _x = c == 'x'; | ^^^^^^^^ interpreting an invalid 32-bit value as a char: $HEX @@ -7,7 +7,7 @@ LL | let _x = c == 'x'; = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information = note: BACKTRACE: - = note: inside `main` at $DIR/invalid_char.rs:LL:CC + = note: inside `main` at $DIR/invalid_char_op.rs:LL:CC note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace diff --git a/src/tools/miri/tests/fail/invalid_enum_tag.rs b/src/tools/miri/tests/fail/validity/invalid_enum_op.rs similarity index 100% rename from src/tools/miri/tests/fail/invalid_enum_tag.rs rename to src/tools/miri/tests/fail/validity/invalid_enum_op.rs diff --git a/src/tools/miri/tests/fail/invalid_enum_tag.stderr b/src/tools/miri/tests/fail/validity/invalid_enum_op.stderr similarity index 85% rename from src/tools/miri/tests/fail/invalid_enum_tag.stderr rename to src/tools/miri/tests/fail/validity/invalid_enum_op.stderr index 5a446bb2a56f..e7997689c51c 100644 --- a/src/tools/miri/tests/fail/invalid_enum_tag.stderr +++ b/src/tools/miri/tests/fail/validity/invalid_enum_op.stderr @@ -1,5 +1,5 @@ error: Undefined Behavior: enum value has invalid tag: $HEX - --> $DIR/invalid_enum_tag.rs:LL:CC + --> $DIR/invalid_enum_op.rs:LL:CC | LL | let _val = mem::discriminant(&f); | ^^^^^^^^^^^^^^^^^^^^^ enum value has invalid tag: $HEX @@ -7,7 +7,7 @@ LL | let _val = mem::discriminant(&f); = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information = note: BACKTRACE: - = note: inside `main` at $DIR/invalid_enum_tag.rs:LL:CC + = note: inside `main` at $DIR/invalid_enum_op.rs:LL:CC note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace diff --git a/src/tools/miri/tests/fail/invalid_int.rs b/src/tools/miri/tests/fail/validity/invalid_int_op.rs similarity index 100% rename from src/tools/miri/tests/fail/invalid_int.rs rename to src/tools/miri/tests/fail/validity/invalid_int_op.rs diff --git a/src/tools/miri/tests/fail/invalid_int.stderr b/src/tools/miri/tests/fail/validity/invalid_int_op.stderr similarity index 88% rename from src/tools/miri/tests/fail/invalid_int.stderr rename to src/tools/miri/tests/fail/validity/invalid_int_op.stderr index a450b9393846..df344311b757 100644 --- a/src/tools/miri/tests/fail/invalid_int.stderr +++ b/src/tools/miri/tests/fail/validity/invalid_int_op.stderr @@ -1,5 +1,5 @@ error: Undefined Behavior: using uninitialized data, but this operation requires initialized memory - --> $DIR/invalid_int.rs:LL:CC + --> $DIR/invalid_int_op.rs:LL:CC | LL | let i = unsafe { std::mem::MaybeUninit::::uninit().assume_init() }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory @@ -7,7 +7,7 @@ LL | let i = unsafe { std::mem::MaybeUninit::::uninit().assume_init() } = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information = note: BACKTRACE: - = note: inside `main` at $DIR/invalid_int.rs:LL:CC + = note: inside `main` at $DIR/invalid_int_op.rs:LL:CC note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace