Reenable xfailed tests for rustboot that pass with trivial or no modifications

9 files changed, 25 insertions, 40 deletions

diff --git a/src/Makefile b/src/Makefile
index 968f9d6c..10031537 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -375,20 +375,11 @@ CONST_TAG_XFAILS := test/run-pass/generic-tag.rs
 # Temporarily xfail some of the task tests, while debugging the
 # overhauled inter-domain messaging system.
 
-TASK_XFAILS := test/run-pass/task-comm-8.rs \
-               test/run-pass/task-comm-10.rs \
-               test/run-pass/task-comm-15.rs \
-               test/run-pass/task-comm-12.rs \
-               test/run-pass/task-comm-2.rs \
-               test/run-pass/task-comm-9.rs \
-               test/run-pass/task-life-0.rs \
-               test/run-pass/alt-type-simple.rs \
-               test/run-pass/many.rs
+TASK_XFAILS := test/run-pass/alt-type-simple.rs
 
 TEST_XFAILS_BOOT :=  $(TASK_XFAILS) \
                     $(NOMINAL_TAG_XFAILS) \
                     $(CONST_TAG_XFAILS) \
-                    test/run-pass/child-outlives-parent.rs \
                     test/run-pass/clone-with-exterior.rs \
                     test/run-pass/constrained-type.rs \
                     test/run-pass/destructor-ordering.rs \
@@ -398,12 +389,8 @@ TEST_XFAILS_BOOT :=  $(TASK_XFAILS) \
                     test/run-pass/generic-recursive-tag.rs \
                     test/run-pass/generic-tup.rs \
                     test/run-pass/iter-ret.rs \
-                    test/run-pass/lib-io.rs \
                     test/run-pass/mlist-cycle.rs \
-                    test/run-pass/obj-as.rs \
                     test/run-pass/task-comm.rs \
-                    test/run-pass/task-comm-3.rs \
-                    test/run-pass/vec-slice.rs \
                     test/run-pass/while-and-do-while.rs \
                     test/run-fail/task-comm-14.rs \
                     test/compile-fail/bad-expr-path.rs \
@@ -412,9 +399,7 @@ TEST_XFAILS_BOOT :=  $(TASK_XFAILS) \
                     test/compile-fail/import3.rs \
                     test/compile-fail/import4.rs \
                     test/compile-fail/bad-recv.rs \
-                    test/compile-fail/bad-send.rs \
-                    test/compile-fail/infinite-vec-type-recursion.rs \
-                    test/compile-fail/writing-through-read-alias.rs
+                    test/compile-fail/bad-send.rs
 
 # Same strategy here for the time being: just list the ones that
 # work and assume the others don't. Invert this when we're closer
diff --git a/src/test/compile-fail/infinite-vec-type-recursion.rs b/src/test/compile-fail/infinite-vec-type-recursion.rs
index 7c82700a..9315488b 100644
--- a/src/test/compile-fail/infinite-vec-type-recursion.rs
+++ b/src/test/compile-fail/infinite-vec-type-recursion.rs
@@ -1,6 +1,6 @@
 // -*- rust -*-
 
-// error-pattern: Infinite type recursion
+// error-pattern: infinite recursive type definition
 
 type x = vec[x];
 
diff --git a/src/test/run-pass/many.rs b/src/test/run-pass/many.rs
index e300312c..2c3d6425 100644
--- a/src/test/run-pass/many.rs
+++ b/src/test/run-pass/many.rs
@@ -1,6 +1,6 @@
 // -*- rust -*-
 
-io fn sub(chan[int] parent, int id) {
+impure fn sub(chan[int] parent, int id) {
   if (id == 0) {
     parent <| 0;
   } else {
@@ -11,7 +11,7 @@ io fn sub(chan[int] parent, int id) {
   }
 }
 
-io fn main() {
+impure fn main() {
   let port[int] p = port();
   auto child = spawn sub(chan(p), 500);
   let int y <- p;
diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/run-pass/task-comm-10.rs
index 4cdcf18b..e0164596 100644
--- a/src/test/run-pass/task-comm-10.rs
+++ b/src/test/run-pass/task-comm-10.rs
@@ -1,11 +1,11 @@
-io fn start(chan[chan[str]] c) {
+impure fn start(chan[chan[str]] c) {
     let port[str] p = port();
     c <| chan(p);
     auto a <- p;
     // auto b <- p; // Never read the second string.
 }
 
-io fn main() {
+impure fn main() {
     let port[chan[str]] p = port();
     auto child = spawn "start" start(chan(p));
     auto c <- p;
diff --git a/src/test/run-pass/task-comm-15.rs b/src/test/run-pass/task-comm-15.rs
index 70680e24..b5bd7331 100644
--- a/src/test/run-pass/task-comm-15.rs
+++ b/src/test/run-pass/task-comm-15.rs
@@ -1,4 +1,4 @@
-io fn start(chan[int] c, int n) {
+impure fn start(chan[int] c, int n) {
     let int i = n;
 
     while(i > 0) {
@@ -7,7 +7,7 @@ io fn start(chan[int] c, int n) {
     }
 }
 
-io fn main() {
+impure fn main() {
     let port[int] p = port();
     // Spawn a task that sends us back messages. The parent task
     // is likely to terminate before the child completes, so from
diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs
index 9a3f9e16..d833c3a5 100644
--- a/src/test/run-pass/task-comm-3.rs
+++ b/src/test/run-pass/task-comm-3.rs
@@ -1,11 +1,11 @@
-io fn main() -> () {
+impure fn main() -> () {
    log "===== WITHOUT THREADS =====";
    test00(false);
    log "====== WITH THREADS ======";
    test00(true);
 }
 
-io fn test00_start(chan[int] ch, int message, int count) {
+impure fn test00_start(chan[int] ch, int message, int count) {
     log "Starting test00_start";
     let int i = 0;
     while (i < count) {
@@ -16,7 +16,7 @@ io fn test00_start(chan[int] ch, int message, int count) {
     log "Ending test00_start";
 }
 
-io fn test00(bool is_multithreaded) {
+impure fn test00(bool is_multithreaded) {
     let int number_of_tasks = 16;
     let int number_of_messages = 4;
     
diff --git a/src/test/run-pass/task-comm-8.rs b/src/test/run-pass/task-comm-8.rs
index c5f73a3f..87fa3d89 100644
--- a/src/test/run-pass/task-comm-8.rs
+++ b/src/test/run-pass/task-comm-8.rs
@@ -1,8 +1,8 @@
-io fn main() -> () {
+impure fn main() -> () {
    test00();
 }
 
-io fn test00_start(chan[int] c, int start, int number_of_messages) {
+impure fn test00_start(chan[int] c, int start, int number_of_messages) {
     let int i = 0;
     while (i < number_of_messages) {
         c <| start + i;
@@ -10,7 +10,7 @@ io fn test00_start(chan[int] c, int start, int number_of_messages) {
     }    
 }
 
-io fn test00() {
+impure fn test00() {
     let int r = 0;    
     let int sum = 0;
     let port[int] p = port();
diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs
index a2c9d5c9..370a36e3 100644
--- a/src/test/run-pass/task-comm-9.rs
+++ b/src/test/run-pass/task-comm-9.rs
@@ -1,8 +1,8 @@
-io fn main() -> () {
+impure fn main() -> () {
    test00();
 }
 
-io fn test00_start(chan[int] c, int number_of_messages) {
+impure fn test00_start(chan[int] c, int number_of_messages) {
     let int i = 0;
     while (i < number_of_messages) {
         c <| i;
@@ -10,7 +10,7 @@ io fn test00_start(chan[int] c, int number_of_messages) {
     }    
 }
 
-io fn test00() {
+impure fn test00() {
     let int r = 0;    
     let int sum = 0;
     let port[int] p = port();
diff --git a/src/test/run-pass/task-comm.rs b/src/test/run-pass/task-comm.rs
index 3c5d3216..d5f9a3a0 100644
--- a/src/test/run-pass/task-comm.rs
+++ b/src/test/run-pass/task-comm.rs
@@ -1,5 +1,5 @@
 
-io fn main() -> () {
+impure fn main() -> () {
     test00(true);
     // test01();
     test02();
@@ -9,7 +9,7 @@ io fn main() -> () {
     test06();
 }
 
-io fn test00_start(chan[int] ch, int message, int count) {
+impure fn test00_start(chan[int] ch, int message, int count) {
     log "Starting test00_start";
     let int i = 0;
     while (i < count) {
@@ -20,7 +20,7 @@ io fn test00_start(chan[int] ch, int message, int count) {
     log "Ending test00_start";
 }
 
-io fn test00(bool is_multithreaded) {
+impure fn test00(bool is_multithreaded) {
     let int number_of_tasks = 1;
     let int number_of_messages = 4;
     log "Creating tasks";
@@ -60,14 +60,14 @@ io fn test00(bool is_multithreaded) {
            (number_of_tasks * number_of_tasks + number_of_tasks) / 2);
 }
 
-io fn test01() {
+impure fn test01() {
     let port[int] p = port();
     log "Reading from a port that is never written to.";
     let int value <- p;
     log value;
 }
 
-io fn test02() {
+impure fn test02() {
     let port[int] p = port();
     let chan[int] c = chan(p);
     log "Writing to a local task channel.";
@@ -111,7 +111,7 @@ fn test04() {
     log "Finishing up.";
 }
 
-io fn test05_start(chan[int] ch) {
+impure fn test05_start(chan[int] ch) {
     ch <| 10;
     ch <| 20;
     ch <| 30;
@@ -119,7 +119,7 @@ io fn test05_start(chan[int] ch) {
     ch <| 30;    
 }
 
-io fn test05() {
+impure fn test05() {
     let port[int] po = port();
     let chan[int] ch = chan(po);
     spawn thread test05_start(ch);