Skip to content

Commit 6972eb4

Browse files
committed
auto merge of #8321 : alexcrichton/rust/enable-rusti, r=cmr
Now that LLVM has been upgraded, I think that we can try again to re-enable the rusti tests.
2 parents 7208095 + d5de801 commit 6972eb4

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

src/librusti/rusti.rs

+8-9
Original file line numberDiff line numberDiff line change
@@ -565,10 +565,7 @@ mod tests {
565565
}
566566
}
567567

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)]
568+
#[cfg(not(target_word_size = "32"))]
572569
fn run_program(prog: &str) {
573570
let mut r = repl();
574571
for cmd in prog.split_iter('\n') {
@@ -577,6 +574,9 @@ mod tests {
577574
"the command '%s' failed", cmd);
578575
}
579576
}
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,13 +594,12 @@ mod tests {
594594
run_program("let a = 3;");
595595
}
596596

597-
#[test] #[ignore]
597+
#[test]
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.
601599
run_program("
602-
spawn( || println(\"Please don't segfault\") );
603-
do spawn { println(\"Please?\"); }
600+
use std::task::try;
601+
try( || println(\"Please don't segfault\") );
602+
do try { println(\"Please?\"); }
604603
");
605604
}
606605

0 commit comments

Comments
 (0)