auto merge of #6327 : z0w0/rust/rm-notest, r=brson

Makes it more consistent, imo.
This commit is contained in:
bors 2013-05-08 18:15:41 -07:00
commit 3bbbb314ee
20 changed files with 131 additions and 132 deletions

View file

@ -119,9 +119,8 @@ pub fn build_configuration(sess: Session, argv0: @~str, input: &input) ->
let default_cfg = default_configuration(sess, argv0, input);
let user_cfg = /*bad*/copy sess.opts.cfg;
// If the user wants a test runner, then add the test cfg
let user_cfg = append_configuration(
user_cfg,
if sess.opts.test { ~"test" } else { ~"notest" });
let user_cfg = if sess.opts.test { append_configuration(user_cfg, ~"test") }
else { user_cfg };
// If the user requested GC, then add the GC cfg
let user_cfg = append_configuration(
user_cfg,