more consistent naming for TLS tests

rust-lang · Nov 11, 2023 · 30145cb · 30145cb
1 parent eb4e895
commit 30145cb
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 5 deletions.
diff --git a/...il/panic/thread_local_const_drop_panic.rs → .../fail/panic/tls_macro_const_drop_panic.rs b/...il/panic/thread_local_const_drop_panic.rs → .../fail/panic/tls_macro_const_drop_panic.rs
diff --git a/...anic/thread_local_const_drop_panic.stderr → ...l/panic/tls_macro_const_drop_panic.stderr b/...anic/thread_local_const_drop_panic.stderr → ...l/panic/tls_macro_const_drop_panic.stderr
@@ -1,4 +1,4 @@
-thread $NAME panicked at $DIR/thread_local_const_drop_panic.rs:LL:CC:
+thread $NAME panicked at $DIR/tls_macro_const_drop_panic.rs:LL:CC:
 ow
 fatal runtime error: thread local panicked on drop
 error: abnormal termination: the program aborted execution

diff --git a/tests/fail/panic/thread_local_drop_panic.rs → tests/fail/panic/tls_macro_drop_panic.rs b/tests/fail/panic/thread_local_drop_panic.rs → tests/fail/panic/tls_macro_drop_panic.rs
diff --git a/...fail/panic/thread_local_drop_panic.stderr → tests/fail/panic/tls_macro_drop_panic.stderr b/...fail/panic/thread_local_drop_panic.stderr → tests/fail/panic/tls_macro_drop_panic.stderr
@@ -1,4 +1,4 @@
-thread $NAME panicked at $DIR/thread_local_drop_panic.rs:LL:CC:
+thread $NAME panicked at $DIR/tls_macro_drop_panic.rs:LL:CC:
 ow
 fatal runtime error: thread local panicked on drop
 error: abnormal termination: the program aborted execution

diff --git a/...oncurrency/thread_local_static_dealloc.rs → tests/fail/tls/tls_static_dealloc.rs b/...oncurrency/thread_local_static_dealloc.rs → tests/fail/tls/tls_static_dealloc.rs
diff --git a/...rrency/thread_local_static_dealloc.stderr → tests/fail/tls/tls_static_dealloc.stderr b/...rrency/thread_local_static_dealloc.stderr → tests/fail/tls/tls_static_dealloc.stderr
@@ -1,13 +1,13 @@
 error: Undefined Behavior: memory access failed: ALLOC has been freed, so this pointer is dangling
-  --> $DIR/thread_local_static_dealloc.rs:LL:CC
+  --> $DIR/tls_static_dealloc.rs:LL:CC
    |
 LL |         let _val = *dangling_ptr.0;
    |                    ^^^^^^^^^^^^^^^ memory access failed: ALLOC has been freed, so this pointer is dangling
    |
    = 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/thread_local_static_dealloc.rs:LL:CC
+   = note: inside `main` at $DIR/tls_static_dealloc.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

diff --git a/tests/pass/concurrency/tls_lib_drop.rs → tests/pass/tls/tls_macro_drop.rs b/tests/pass/concurrency/tls_lib_drop.rs → tests/pass/tls/tls_macro_drop.rs
diff --git a/...ass/concurrency/tls_lib_drop.stack.stdout → tests/pass/tls/tls_macro_drop.stack.stdout b/...ass/concurrency/tls_lib_drop.stack.stdout → tests/pass/tls/tls_macro_drop.stack.stdout
diff --git a/...pass/concurrency/tls_lib_drop.tree.stdout → tests/pass/tls/tls_macro_drop.tree.stdout b/...pass/concurrency/tls_lib_drop.tree.stdout → tests/pass/tls/tls_macro_drop.tree.stdout
diff --git a/...concurrency/tls_lib_drop_single_thread.rs → .../pass/tls/tls_macro_drop_single_thread.rs b/...concurrency/tls_lib_drop_single_thread.rs → .../pass/tls/tls_macro_drop_single_thread.rs
@@ -1,4 +1,5 @@
-//! Check that destructors of the thread locals are executed on all OSes.
+//! Check that destructors of the thread locals are executed on all OSes
+//! (even when we do not support concurrency, and cannot run the other test).
 
 use std::cell::RefCell;
 

diff --git a/...urrency/tls_lib_drop_single_thread.stderr → ...s/tls/tls_macro_drop_single_thread.stderr b/...urrency/tls_lib_drop_single_thread.stderr → ...s/tls/tls_macro_drop_single_thread.stderr
diff --git a/tests/pass/concurrency/thread_locals.rs → tests/pass/tls/tls_static.rs b/tests/pass/concurrency/thread_locals.rs → tests/pass/tls/tls_static.rs