Skip to content

Commit 34f8138

Browse files
committed
---
yaml --- r: 142510 b: refs/heads/try2 c: ed69ef0 h: refs/heads/master v: v3
1 parent cb16062 commit 34f8138

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 00ba8b3ac0692293511858cae6fe1a3e1dcc316b
8+
refs/heads/try2: ed69ef0b6625efa652864eda2d5469eb92dcb682
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/tests.mk

Lines changed: 2 additions & 1 deletion
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

branches/try2/src/librusti/rusti.rs

Lines changed: 2 additions & 2 deletions
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)