about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-07-08 04:28:53 -0700
committerbors <bors@rust-lang.org>2013-07-08 04:28:53 -0700
commit65ed80339b52bae26457f5c19dc9861bd7de643e (patch)
tree2cb9612e8c959423ead8171f688daa637efb2ed0 /src
parent48ad726f2abc90fe62cdf239bc1c9318261a6926 (diff)
parentd49acef07be04a2d32021dd1edadcf76582eda2c (diff)
downloadrust-65ed80339b52bae26457f5c19dc9861bd7de643e.tar.gz
rust-65ed80339b52bae26457f5c19dc9861bd7de643e.zip
auto merge of #7568 : alexcrichton/rust/check-lite, r=huonw
A lot of cross-platform issues stem from rusti/rustpkg, so include these two test suites in the 'check-lite' target which is run on the cross-compile bots. It shouldn't be much of a performance hit because these suites are pretty fast to run.

Hopefully this will make snapshot/tarball creation easier in the future. 
Diffstat (limited to 'src')
-rw-r--r--src/librusti/rusti.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librusti/rusti.rs b/src/librusti/rusti.rs
index d7c03ce2ba7..473f2e57479 100644
--- a/src/librusti/rusti.rs
+++ b/src/librusti/rusti.rs
@@ -530,7 +530,8 @@ mod tests {
 
     // FIXME: #7220 rusti on 32bit mac doesn't work.
     // FIXME: #7641 rusti on 32bit linux cross compile doesn't work
-    #[cfg(not(target_word_size="32"))]
+    // FIXME: #7115 re-enable once LLVM has been upgraded
+    #[cfg(thiswillneverbeacfgflag)]
     fn run_program(prog: &str) {
         let mut r = repl();
         for prog.split_iter('\n').advance |cmd| {
@@ -539,7 +540,6 @@ mod tests {
             r = result.expect(fmt!("the command '%s' failed", cmd));
         }
     }
-    #[cfg(target_word_size="32")]
     fn run_program(_: &str) {}
 
     #[test]