---

yaml
---
r: 33667
b: refs/heads/snap-stage3
c: b808eab
h: refs/heads/master
i:
  33665: af1c2dc
  33663: f113cbc
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 28c7a251514919a2d7bdf6c67b8edf5eed9043db
+refs/heads/snap-stage3: b808eaba37c589544cc90c473f5f9d84a507afea
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/front/test.rs

@@ -29,7 +29,13 @@ type test_ctxt =
 fn modify_for_testing(sess: session::Session,
                       crate: @ast::crate) -> @ast::crate {
 
-    if sess.opts.test {
+    // We generate the test harness when building in the 'test'
+    // configuration, either with the '--test' or '--cfg test'
+    // command line options.
+    let should_test = attr::contains(crate.node.config,
+                                     attr::mk_word_item(~"test"));
+
+    if should_test {
         generate_test_harness(sess, crate)
     } else {
         strip_test_functions(crate)