Merge from rustc

7 files changed, 32 insertions, 32 deletions

diff --git a/tests/ui/command/command-argv0.rs b/tests/ui/command/command-argv0.rs
index b782a4fd3d1..53649e35a89 100644
--- a/tests/ui/command/command-argv0.rs
+++ b/tests/ui/command/command-argv0.rs
@@ -1,8 +1,8 @@
-// run-pass
+//@ run-pass
 
-// ignore-windows - this is a unix-specific test
-// ignore-emscripten no processes
-// ignore-sgx no processes
+//@ ignore-windows - this is a unix-specific test
+//@ ignore-emscripten no processes
+//@ ignore-sgx no processes
 use std::env;
 use std::os::unix::process::CommandExt;
 use std::process::Command;
diff --git a/tests/ui/command/command-current-dir.rs b/tests/ui/command/command-current-dir.rs
index 5d06fcdebc6..7186a165a96 100644
--- a/tests/ui/command/command-current-dir.rs
+++ b/tests/ui/command/command-current-dir.rs
@@ -1,7 +1,7 @@
-// run-pass
-// ignore-emscripten no processes
-// ignore-sgx no processes
-// ignore-fuchsia Needs directory creation privilege
+//@ run-pass
+//@ ignore-emscripten no processes
+//@ ignore-sgx no processes
+//@ ignore-fuchsia Needs directory creation privilege
 
 use std::env;
 use std::fs;
diff --git a/tests/ui/command/command-exec.rs b/tests/ui/command/command-exec.rs
index edc33446d79..3cc5d0bbd3e 100644
--- a/tests/ui/command/command-exec.rs
+++ b/tests/ui/command/command-exec.rs
@@ -1,10 +1,10 @@
-// run-pass
+//@ run-pass
 
 #![allow(stable_features)]
-// ignore-windows - this is a unix-specific test
-// ignore-emscripten no processes
-// ignore-sgx no processes
-// ignore-fuchsia no execvp syscall provided
+//@ ignore-windows - this is a unix-specific test
+//@ ignore-emscripten no processes
+//@ ignore-sgx no processes
+//@ ignore-fuchsia no execvp syscall provided
 
 #![feature(process_exec)]
 
diff --git a/tests/ui/command/command-pre-exec.rs b/tests/ui/command/command-pre-exec.rs
index e8a909eecc1..2f3483fad08 100644
--- a/tests/ui/command/command-pre-exec.rs
+++ b/tests/ui/command/command-pre-exec.rs
@@ -1,10 +1,10 @@
-// run-pass
+//@ run-pass
 
 #![allow(stable_features)]
-// ignore-windows - this is a unix-specific test
-// ignore-emscripten no processes
-// ignore-sgx no processes
-// ignore-fuchsia no execvp syscall
+//@ ignore-windows - this is a unix-specific test
+//@ ignore-emscripten no processes
+//@ ignore-sgx no processes
+//@ ignore-fuchsia no execvp syscall
 #![feature(process_exec, rustc_private)]
 
 extern crate libc;
diff --git a/tests/ui/command/command-setgroups.rs b/tests/ui/command/command-setgroups.rs
index 7e321f2f0cd..f5dbf43feb5 100644
--- a/tests/ui/command/command-setgroups.rs
+++ b/tests/ui/command/command-setgroups.rs
@@ -1,9 +1,9 @@
-// run-pass
-// ignore-windows - this is a unix-specific test
-// ignore-emscripten
-// ignore-sgx
-// ignore-musl - returns dummy result for _SC_NGROUPS_MAX
-// ignore-nto - does not have `/bin/id`, expects groups to be i32 (not u32)
+//@ run-pass
+//@ ignore-windows - this is a unix-specific test
+//@ ignore-emscripten
+//@ ignore-sgx
+//@ ignore-musl - returns dummy result for _SC_NGROUPS_MAX
+//@ ignore-nto - does not have `/bin/id`, expects groups to be i32 (not u32)
 
 #![feature(rustc_private)]
 #![feature(setgroups)]
diff --git a/tests/ui/command/command-uid-gid.rs b/tests/ui/command/command-uid-gid.rs
index aa4e2f5b893..7a70a0fbd76 100644
--- a/tests/ui/command/command-uid-gid.rs
+++ b/tests/ui/command/command-uid-gid.rs
@@ -1,8 +1,8 @@
-// run-pass
-// ignore-android
-// ignore-emscripten
-// ignore-sgx
-// ignore-fuchsia no '/bin/sh', '/bin/ls'
+//@ run-pass
+//@ ignore-android
+//@ ignore-emscripten
+//@ ignore-sgx
+//@ ignore-fuchsia no '/bin/sh', '/bin/ls'
 
 #![feature(rustc_private)]
 
diff --git a/tests/ui/command/issue-10626.rs b/tests/ui/command/issue-10626.rs
index 696a2dd1657..c63edb83700 100644
--- a/tests/ui/command/issue-10626.rs
+++ b/tests/ui/command/issue-10626.rs
@@ -1,6 +1,6 @@
-// run-pass
-// ignore-emscripten no processes
-// ignore-sgx no processes
+//@ run-pass
+//@ ignore-emscripten no processes
+//@ ignore-sgx no processes
 
 // Make sure that if a process doesn't have its stdio/stderr descriptors set up
 // that we don't die in a large ball of fire