---

yaml
---
r: 40374
b: refs/heads/dist-snap
c: b808eab
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 28c7a251514919a2d7bdf6c67b8edf5eed9043db
+refs/heads/dist-snap: b808eaba37c589544cc90c473f5f9d84a507afea
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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)