about summary refs log tree commit diff
path: root/src/libtest
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-09-27 01:37:53 +0000
committerbors <bors@rust-lang.org>2014-09-27 01:37:53 +0000
commit43d7d7c15e964c1cb506cbce90bb4b32b57281b8 (patch)
treece3d1c405d06461fb8de8ba58b7f62440be5d199 /src/libtest
parentd64b4103d688f38c2e9e2daf966d50beeb383f1e (diff)
parentdcdbdc10036b444ef39c329e9440d4acc6975fda (diff)
downloadrust-43d7d7c15e964c1cb506cbce90bb4b32b57281b8.tar.gz
rust-43d7d7c15e964c1cb506cbce90bb4b32b57281b8.zip
auto merge of #17506 : sfackler/rust/cfg-attr, r=alexcrichton
cc #17490 

Reopening of #16230
Diffstat (limited to 'src/libtest')
-rw-r--r--src/libtest/lib.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index 43a1899f45e..04489d78027 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -356,8 +356,7 @@ Test Attributes:
     #[ignore]      - When applied to a function which is already attributed as a
                      test, then the test runner will ignore these tests during
                      normal test runs. Running with --ignored will run these
-                     tests. This may also be written as #[ignore(cfg(...))] to
-                     ignore the test on certain configurations.",
+                     tests.",
              usage = getopts::usage(message.as_slice(),
                                     optgroups().as_slice()));
 }