From d49acef07be04a2d32021dd1edadcf76582eda2c Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 3 Jul 2013 09:11:48 -0700
Subject: [PATCH] Add rusti/rustpkg to check-lite

Ironically also disable rusti tests for now, but mainly because they're awaiting
LLVM upgrades before proceeding
---
 mk/tests.mk           | 3 ++-
 src/librusti/rusti.rs | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mk/tests.mk b/mk/tests.mk
index 9a991c15197..6b6f515ce2b 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -15,7 +15,7 @@
 
 # The names of crates that must be tested
 TEST_TARGET_CRATES = std extra
-TEST_HOST_CRATES = syntax rustc rustdoc rust rustpkg
+TEST_HOST_CRATES = syntax rustc rustdoc rust rustpkg rusti
 TEST_CRATES = $(TEST_TARGET_CRATES) $(TEST_HOST_CRATES)
 
 # Markdown files under doc/ that should have their code extracted and run
@@ -157,6 +157,7 @@ check-test: cleantestlibs cleantmptestlogs all check-stage2-rfail
 
 check-lite: cleantestlibs cleantmptestlogs \
 	check-stage2-std check-stage2-extra check-stage2-rpass \
+	check-stage2-rustpkg check-stage2-rusti \
 	check-stage2-rfail check-stage2-cfail
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
diff --git a/src/librusti/rusti.rs b/src/librusti/rusti.rs
index d9cd52201c0..5399ff6272d 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]