---

yaml
---
r: 40375
b: refs/heads/dist-snap
c: 11024ea
h: refs/heads/master
i:
  40373: 6ae4fc5
  40371: 7a5c42a
  40367: 7249beb
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: b808eaba37c589544cc90c473f5f9d84a507afea
+refs/heads/dist-snap: 11024eaebbd5d958df3944178e5746c0d9fda383
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -71,14 +71,15 @@ fn strip_test_functions(crate: @ast::crate) -> @ast::crate {
 fn fold_mod(cx: test_ctxt, m: ast::_mod, fld: fold::ast_fold) -> ast::_mod {
 
     // Remove any defined main function from the AST so it doesn't clash with
-    // the one we're going to add.
+    // the one we're going to add. Only if compiling an executable.
 
     // FIXME (#2403): This is sloppy. Instead we should have some mechanism to
     // indicate to the translation pass which function we want to be main.
     fn nomain(cx: test_ctxt, item: @ast::item) -> Option<@ast::item> {
         match item.node {
           ast::item_fn(*) => {
-            if item.ident == cx.sess.ident_of(~"main") {
+            if item.ident == cx.sess.ident_of(~"main")
+                && !cx.sess.building_library {
                 option::None
             } else { option::Some(item) }
           }