Skip to content

Commit a278936

Browse files
committed
Reenable xfailed tests for rustboot that pass with trivial or no modifications
1 parent bf9cebf commit a278936

File tree

9 files changed

+25
-40
lines changed

9 files changed

+25
-40
lines changed

src/Makefile

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -375,20 +375,11 @@ CONST_TAG_XFAILS := test/run-pass/generic-tag.rs
375375
# Temporarily xfail some of the task tests, while debugging the
376376
# overhauled inter-domain messaging system.
377377

378-
TASK_XFAILS := test/run-pass/task-comm-8.rs \
379-
test/run-pass/task-comm-10.rs \
380-
test/run-pass/task-comm-15.rs \
381-
test/run-pass/task-comm-12.rs \
382-
test/run-pass/task-comm-2.rs \
383-
test/run-pass/task-comm-9.rs \
384-
test/run-pass/task-life-0.rs \
385-
test/run-pass/alt-type-simple.rs \
386-
test/run-pass/many.rs
378+
TASK_XFAILS := test/run-pass/alt-type-simple.rs
387379

388380
TEST_XFAILS_BOOT := $(TASK_XFAILS) \
389381
$(NOMINAL_TAG_XFAILS) \
390382
$(CONST_TAG_XFAILS) \
391-
test/run-pass/child-outlives-parent.rs \
392383
test/run-pass/clone-with-exterior.rs \
393384
test/run-pass/constrained-type.rs \
394385
test/run-pass/destructor-ordering.rs \
@@ -398,12 +389,8 @@ TEST_XFAILS_BOOT := $(TASK_XFAILS) \
398389
test/run-pass/generic-recursive-tag.rs \
399390
test/run-pass/generic-tup.rs \
400391
test/run-pass/iter-ret.rs \
401-
test/run-pass/lib-io.rs \
402392
test/run-pass/mlist-cycle.rs \
403-
test/run-pass/obj-as.rs \
404393
test/run-pass/task-comm.rs \
405-
test/run-pass/task-comm-3.rs \
406-
test/run-pass/vec-slice.rs \
407394
test/run-pass/while-and-do-while.rs \
408395
test/run-fail/task-comm-14.rs \
409396
test/compile-fail/bad-expr-path.rs \
@@ -412,9 +399,7 @@ TEST_XFAILS_BOOT := $(TASK_XFAILS) \
412399
test/compile-fail/import3.rs \
413400
test/compile-fail/import4.rs \
414401
test/compile-fail/bad-recv.rs \
415-
test/compile-fail/bad-send.rs \
416-
test/compile-fail/infinite-vec-type-recursion.rs \
417-
test/compile-fail/writing-through-read-alias.rs
402+
test/compile-fail/bad-send.rs
418403

419404
# Same strategy here for the time being: just list the ones that
420405
# work and assume the others don't. Invert this when we're closer

src/test/compile-fail/infinite-vec-type-recursion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// -*- rust -*-
22

3-
// error-pattern: Infinite type recursion
3+
// error-pattern: infinite recursive type definition
44

55
type x = vec[x];
66

src/test/run-pass/many.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// -*- rust -*-
22

3-
io fn sub(chan[int] parent, int id) {
3+
impure fn sub(chan[int] parent, int id) {
44
if (id == 0) {
55
parent <| 0;
66
} else {
@@ -11,7 +11,7 @@ io fn sub(chan[int] parent, int id) {
1111
}
1212
}
1313

14-
io fn main() {
14+
impure fn main() {
1515
let port[int] p = port();
1616
auto child = spawn sub(chan(p), 500);
1717
let int y <- p;

src/test/run-pass/task-comm-10.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
io fn start(chan[chan[str]] c) {
1+
impure fn start(chan[chan[str]] c) {
22
let port[str] p = port();
33
c <| chan(p);
44
auto a <- p;
55
// auto b <- p; // Never read the second string.
66
}
77

8-
io fn main() {
8+
impure fn main() {
99
let port[chan[str]] p = port();
1010
auto child = spawn "start" start(chan(p));
1111
auto c <- p;

src/test/run-pass/task-comm-15.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
io fn start(chan[int] c, int n) {
1+
impure fn start(chan[int] c, int n) {
22
let int i = n;
33

44
while(i > 0) {
@@ -7,7 +7,7 @@ io fn start(chan[int] c, int n) {
77
}
88
}
99

10-
io fn main() {
10+
impure fn main() {
1111
let port[int] p = port();
1212
// Spawn a task that sends us back messages. The parent task
1313
// is likely to terminate before the child completes, so from

src/test/run-pass/task-comm-3.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
io fn main() -> () {
1+
impure fn main() -> () {
22
log "===== WITHOUT THREADS =====";
33
test00(false);
44
log "====== WITH THREADS ======";
55
test00(true);
66
}
77

8-
io fn test00_start(chan[int] ch, int message, int count) {
8+
impure fn test00_start(chan[int] ch, int message, int count) {
99
log "Starting test00_start";
1010
let int i = 0;
1111
while (i < count) {
@@ -16,7 +16,7 @@ io fn test00_start(chan[int] ch, int message, int count) {
1616
log "Ending test00_start";
1717
}
1818

19-
io fn test00(bool is_multithreaded) {
19+
impure fn test00(bool is_multithreaded) {
2020
let int number_of_tasks = 16;
2121
let int number_of_messages = 4;
2222

src/test/run-pass/task-comm-8.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
io fn main() -> () {
1+
impure fn main() -> () {
22
test00();
33
}
44

5-
io fn test00_start(chan[int] c, int start, int number_of_messages) {
5+
impure fn test00_start(chan[int] c, int start, int number_of_messages) {
66
let int i = 0;
77
while (i < number_of_messages) {
88
c <| start + i;
99
i += 1;
1010
}
1111
}
1212

13-
io fn test00() {
13+
impure fn test00() {
1414
let int r = 0;
1515
let int sum = 0;
1616
let port[int] p = port();

src/test/run-pass/task-comm-9.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
io fn main() -> () {
1+
impure fn main() -> () {
22
test00();
33
}
44

5-
io fn test00_start(chan[int] c, int number_of_messages) {
5+
impure fn test00_start(chan[int] c, int number_of_messages) {
66
let int i = 0;
77
while (i < number_of_messages) {
88
c <| i;
99
i += 1;
1010
}
1111
}
1212

13-
io fn test00() {
13+
impure fn test00() {
1414
let int r = 0;
1515
let int sum = 0;
1616
let port[int] p = port();

src/test/run-pass/task-comm.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
io fn main() -> () {
2+
impure fn main() -> () {
33
test00(true);
44
// test01();
55
test02();
@@ -9,7 +9,7 @@ io fn main() -> () {
99
test06();
1010
}
1111

12-
io fn test00_start(chan[int] ch, int message, int count) {
12+
impure fn test00_start(chan[int] ch, int message, int count) {
1313
log "Starting test00_start";
1414
let int i = 0;
1515
while (i < count) {
@@ -20,7 +20,7 @@ io fn test00_start(chan[int] ch, int message, int count) {
2020
log "Ending test00_start";
2121
}
2222

23-
io fn test00(bool is_multithreaded) {
23+
impure fn test00(bool is_multithreaded) {
2424
let int number_of_tasks = 1;
2525
let int number_of_messages = 4;
2626
log "Creating tasks";
@@ -60,14 +60,14 @@ io fn test00(bool is_multithreaded) {
6060
(number_of_tasks * number_of_tasks + number_of_tasks) / 2);
6161
}
6262

63-
io fn test01() {
63+
impure fn test01() {
6464
let port[int] p = port();
6565
log "Reading from a port that is never written to.";
6666
let int value <- p;
6767
log value;
6868
}
6969

70-
io fn test02() {
70+
impure fn test02() {
7171
let port[int] p = port();
7272
let chan[int] c = chan(p);
7373
log "Writing to a local task channel.";
@@ -111,15 +111,15 @@ fn test04() {
111111
log "Finishing up.";
112112
}
113113

114-
io fn test05_start(chan[int] ch) {
114+
impure fn test05_start(chan[int] ch) {
115115
ch <| 10;
116116
ch <| 20;
117117
ch <| 30;
118118
ch <| 30;
119119
ch <| 30;
120120
}
121121

122-
io fn test05() {
122+
impure fn test05() {
123123
let port[int] po = port();
124124
let chan[int] ch = chan(po);
125125
spawn thread test05_start(ch);

0 commit comments

Comments
 (0)