Skip to content

Commit 29ffbba

Browse files
committed
auto merge of #8373 : alexcrichton/rust/disable-rusti, r=cmr
These are causing problems on the linux bots, I'll investigate soon.
2 parents 597b3fd + 0927d62 commit 29ffbba

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/librusti/rusti.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,10 @@ mod tests {
565565
}
566566
}
567567

568-
#[cfg(not(target_word_size = "32"))]
568+
// FIXME: #7220 rusti on 32bit mac doesn't work.
569+
// FIXME: #7641 rusti on 32bit linux cross compile doesn't work
570+
// FIXME: #7115 re-enable once LLVM has been upgraded
571+
#[cfg(thiswillneverbeacfgflag)]
569572
fn run_program(prog: &str) {
570573
let mut r = repl();
571574
for cmd in prog.split_iter('\n') {
@@ -574,9 +577,6 @@ mod tests {
574577
"the command '%s' failed", cmd);
575578
}
576579
}
577-
// FIXME: #7220 rusti on 32bit mac doesn't work
578-
// FIXME: #7641 rusti on 32bit linux cross compile doesn't work
579-
#[cfg(target_word_size = "32")]
580580
fn run_program(_: &str) {}
581581

582582
#[test]
@@ -594,12 +594,13 @@ mod tests {
594594
run_program("let a = 3;");
595595
}
596596

597-
#[test]
597+
#[test] #[ignore]
598598
fn new_tasks() {
599+
// XXX: can't spawn new tasks because the JIT code is cleaned up
600+
// after the main function is done.
599601
run_program("
600-
use std::task::try;
601-
try( || println(\"Please don't segfault\") );
602-
do try { println(\"Please?\"); }
602+
spawn( || println(\"Please don't segfault\") );
603+
do spawn { println(\"Please?\"); }
603604
");
604605
}
605606

0 commit comments

Comments
 (0)