Skip to content

Commit 65ed803

Browse files
committed
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.
2 parents 48ad726 + d49acef commit 65ed803

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

mk/tests.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
# The names of crates that must be tested
1717
TEST_TARGET_CRATES = std extra
18-
TEST_HOST_CRATES = syntax rustc rustdoc rust rustpkg
18+
TEST_HOST_CRATES = syntax rustc rustdoc rust rustpkg rusti
1919
TEST_CRATES = $(TEST_TARGET_CRATES) $(TEST_HOST_CRATES)
2020

2121
# Markdown files under doc/ that should have their code extracted and run
@@ -157,6 +157,7 @@ check-test: cleantestlibs cleantmptestlogs all check-stage2-rfail
157157

158158
check-lite: cleantestlibs cleantmptestlogs \
159159
check-stage2-std check-stage2-extra check-stage2-rpass \
160+
check-stage2-rustpkg check-stage2-rusti \
160161
check-stage2-rfail check-stage2-cfail
161162
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
162163

src/librusti/rusti.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,8 @@ mod tests {
530530

531531
// FIXME: #7220 rusti on 32bit mac doesn't work.
532532
// FIXME: #7641 rusti on 32bit linux cross compile doesn't work
533-
#[cfg(not(target_word_size="32"))]
533+
// FIXME: #7115 re-enable once LLVM has been upgraded
534+
#[cfg(thiswillneverbeacfgflag)]
534535
fn run_program(prog: &str) {
535536
let mut r = repl();
536537
for prog.split_iter('\n').advance |cmd| {
@@ -539,7 +540,6 @@ mod tests {
539540
r = result.expect(fmt!("the command '%s' failed", cmd));
540541
}
541542
}
542-
#[cfg(target_word_size="32")]
543543
fn run_program(_: &str) {}
544544

545545
#[test]

0 commit comments

Comments
 (0)