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

Commit af033ea

Browse files
borsbors
committed
Auto merge of rust-lang#2492 - RalfJung:tests, r=RalfJung
organize shim tests into shims folder, and various test suite tweaks
2 parents b8f6178 + ed41f1c commit af033ea

File tree

116 files changed

+128
-218
lines changed

Some content is hidden

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

116 files changed

+128
-218
lines changed

‎tests/fail/concurrency/libc_pthread_create_main_terminate.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
// Check that we terminate the program when the main thread terminates.
55

6-
#![feature(rustc_private)]
7-
86
use std::{mem, ptr};
97

108
extern "C" fn thread_start(_null: *mut libc::c_void) -> *mut libc::c_void {

‎tests/fail/concurrency/libc_pthread_join_detached.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
// Joining a detached thread is undefined behavior.
44

5-
#![feature(rustc_private)]
6-
75
use std::{mem, ptr};
86

97
extern "C" fn thread_start(_null: *mut libc::c_void) -> *mut libc::c_void {

‎tests/fail/concurrency/libc_pthread_join_joined.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
// Joining an already joined thread is undefined behavior.
44

5-
#![feature(rustc_private)]
6-
75
use std::{mem, ptr};
86

97
extern "C" fn thread_start(_null: *mut libc::c_void) -> *mut libc::c_void {

‎tests/fail/concurrency/libc_pthread_join_main.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
// Joining the main thread is undefined behavior.
44

5-
#![feature(rustc_private)]
6-
75
use std::{ptr, thread};
86

97
fn main() {

‎tests/fail/concurrency/libc_pthread_join_multiple.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
// Joining the same thread from multiple threads is undefined behavior.
44

5-
#![feature(rustc_private)]
6-
75
use std::thread;
86
use std::{mem, ptr};
97

‎tests/fail/concurrency/libc_pthread_join_self.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
// Joining itself is undefined behavior.
66

7-
#![feature(rustc_private)]
8-
97
use std::{ptr, thread};
108

119
fn main() {

‎tests/fail/concurrency/too_few_args.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
//! The thread function must have exactly one argument.
44
5-
#![feature(rustc_private)]
6-
75
use std::{mem, ptr};
86

97
extern "C" fn thread_start() -> *mut libc::c_void {

‎tests/fail/concurrency/too_many_args.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
//! The thread function must have exactly one argument.
44
5-
#![feature(rustc_private)]
6-
75
use std::{mem, ptr};
86

97
extern "C" fn thread_start(_null: *mut libc::c_void, _x: i32) -> *mut libc::c_void {

‎tests/fail/concurrency/unwind_top_of_stack.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
//! Unwinding past the top frame of a stack is Undefined Behavior.
55
6-
#![feature(rustc_private, c_unwind)]
6+
#![feature(c_unwind)]
77

88
use std::{mem, ptr};
99

‎tests/fail/backtrace/bad-backtrace-decl.rs‎ renamed to ‎tests/fail/shims/backtrace/bad-backtrace-decl.rs‎

File renamed without changes.

0 commit comments

Comments
 (0)