---

yaml
---
r: 36279
b: refs/heads/try2
c: b808eab
h: refs/heads/master
i:
  36277: 6462720
  36275: 038ff73
  36271: 5c9e65d
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 28c7a251514919a2d7bdf6c67b8edf5eed9043db
+refs/heads/try2: b808eaba37c589544cc90c473f5f9d84a507afea
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/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)