Skip to content

Commit 6891a8d

Browse files
graydongraydon
committed
---
yaml --- r: 1865 b: refs/heads/master c: 49d9d56 h: refs/heads/master i: 1863: 4d5b254 v: v3
1 parent b9f6a0d commit 6891a8d

File tree

163 files changed

+246
-235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+246
-235
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: a47cd50dfb9b8d88abea0baf4122e454d82e09e9
2+
refs/heads/master: 49d9d5688e12a7874cd6e06c0122577e6b7d1167

‎trunk/Makefile.in

Lines changed: 56 additions & 234 deletions
Original file line numberDiff line numberDiff line change
@@ -568,195 +568,17 @@ docsnap: doc/rust.pdf
568568
# Testing variables
569569
######################################################################
570570

571-
# Float doesn't work in boot
572-
573-
FLOAT_XFAILS := $(S)src/test/run-pass/float.rs \
574-
$(S)src/test/run-pass/float2.rs \
575-
$(S)src/test/run-pass/float-signature.rs \
576-
$(S)src/test/run-pass/floatlits.rs
577-
578-
# Temporarily xfail tests broken by the nominal-tags change.
579-
580-
NOMINAL_TAG_XFAILS := $(S)src/test/run-pass/mlist.rs
581-
582-
# Temporarily xfail tests broken by the constant-tags change.
583-
584-
CONST_TAG_XFAILS := $(S)src/test/run-pass/generic-tag.rs
585-
586-
# Temporarily xfail some of the task tests, while debugging the
587-
# overhauled inter-domain messaging system.
588-
589-
TASK_XFAILS := $(addprefix $(S)src/test/run-pass/, \
590-
task-comm-8.rs \
591-
task-comm-10.rs \
592-
task-comm-15.rs \
593-
task-comm-12.rs \
594-
task-comm-2.rs \
595-
task-comm-9.rs \
596-
task-comm-chan-nil.rs \
597-
task-life-0.rs \
598-
alt-type-simple.rs \
599-
many.rs)
600-
601-
TEST_XFAILS_BOOT := $(TASK_XFAILS) \
602-
$(NOMINAL_TAG_XFAILS) \
603-
$(CONST_TAG_XFAILS) \
604-
$(FLOAT_XFAILS) \
605-
$(addprefix $(S)src/test/run-pass/, \
606-
arith-unsigned.rs \
607-
box-compare.rs \
608-
child-outlives-parent.rs \
609-
clone-with-exterior.rs \
610-
constrained-type.rs \
611-
destructor-ordering.rs \
612-
obj-as.rs \
613-
vec-slice.rs \
614-
fn-lval.rs \
615-
empty-mutable-vec.rs \
616-
generic-bind-2.rs \
617-
generic-fn-box.rs \
618-
generic-tup.rs \
619-
iter-ret.rs \
620-
leak-tag-copy.rs \
621-
lib-io.rs \
622-
maybe-mutable.rs \
623-
mlist-cycle.rs \
624-
obj-as.rs \
625-
seq-compare.rs \
626-
task-comm.rs \
627-
task-comm-3.rs \
628-
vec-slice.rs \
629-
while-and-do-while.rs) \
630-
$(addprefix $(S)src/test/run-fail/, \
631-
task-comm-14.rs) \
632-
$(addprefix $(S)src/test/compile-fail/, \
633-
bad-expr-path.rs \
634-
import.rs \
635-
import2.rs \
636-
import3.rs \
637-
import4.rs \
638-
bad-recv.rs \
639-
bad-send.rs \
640-
infinite-vec-type-recursion.rs \
641-
tail-non-call.rs \
642-
writing-through-read-alias.rs) \
643-
$(S)src/test/bench/shootout/nbody.rs
644-
645-
TEST_XFAILS_STAGE0 := $(addprefix $(S)src/test/run-pass/, \
646-
acyclic-unwind.rs \
647-
alt-pattern-drop.rs \
648-
alt-type-simple.rs \
649-
basic-1.rs \
650-
basic-2.rs \
651-
basic.rs \
652-
child-outlives-parent.rs \
653-
clone-with-exterior.rs \
654-
comm.rs \
655-
constrained-type.rs \
656-
destructor-ordering.rs \
657-
iter-ret.rs \
658-
lazychan.rs \
659-
lib-bitv.rs \
660-
lib-deque.rs \
661-
lib-int.rs \
662-
lib-io.rs \
663-
lib-map.rs \
664-
lib-rand.rs \
665-
lib-sha1.rs \
666-
lib-sort.rs \
667-
lib-str.rs \
668-
lib-str-buf.rs \
669-
lib-task.rs \
670-
lib-uint.rs \
671-
lib-vec-str-conversions.rs \
672-
lib-vec.rs \
673-
many.rs \
674-
mlist-cycle.rs \
675-
mlist.rs \
676-
mutable-alias-vec.rs \
677-
obj-as.rs \
678-
obj-dtor.rs \
679-
pred.rs \
680-
preempt.rs \
681-
rt-circular-buffer.rs \
682-
size-and-align.rs \
683-
spawn-fn.rs \
684-
spawn-module-qualified.rs \
685-
spawn.rs \
686-
str-append.rs \
687-
syntax-extension-fmt.rs \
688-
syntax-extension-shell.rs \
689-
task-comm-0.rs \
690-
task-comm-1.rs \
691-
task-comm-10.rs \
692-
task-comm-11.rs \
693-
task-comm-12.rs \
694-
task-comm-13-thread.rs \
695-
task-comm-13.rs \
696-
task-comm-15.rs \
697-
task-comm-2.rs \
698-
task-comm-3.rs \
699-
task-comm-7.rs \
700-
task-comm-8.rs \
701-
task-comm-9.rs \
702-
task-comm.rs \
703-
task-killjoin.rs \
704-
task-life-0.rs \
705-
threads.rs \
706-
type-sizes.rs \
707-
typestate-cfg-nesting.rs \
708-
use.rs \
709-
use-import-export.rs \
710-
user.rs \
711-
utf8.rs \
712-
utf8_chars.rs \
713-
vec-alloc-append.rs \
714-
vec-append.rs \
715-
vec-slice.rs \
716-
while-with-break.rs \
717-
yield.rs \
718-
yield2.rs \
719-
multi.rc \
720-
native-mod.rc \
721-
native.rc \
722-
) \
723-
$(filter-out \
724-
$(addprefix $(S)src/test/compile-fail/, \
725-
alt-tag-nullary.rs \
726-
alt-tag-unary.rs \
727-
arg-count-mismatch.rs \
728-
arg-type-mismatch.rs \
729-
bad-expr-path.rs \
730-
bad-expr-path2.rs \
731-
bogus-tag.rs \
732-
fru-extra-field.rs \
733-
import.rs \
734-
import2.rs \
735-
import3.rs \
736-
import4.rs \
737-
import-loop.rs \
738-
import-loop-2.rs \
739-
multiline-comment-line-tracking.rs \
740-
output-type-mismatch.rs \
741-
rec-missing-fields.rs \
742-
reserved-dec.rs \
743-
reserved-f128.rs \
744-
reserved-f16.rs \
745-
reserved-f80.rs \
746-
reserved-m128.rs \
747-
reserved-m32.rs \
748-
reserved-m64.rs \
749-
tail-non-call.rs \
750-
tail-typeck.rs \
751-
type-shadow.rs \
752-
while-type-error.rs \
753-
wrong-ret-type.rs \
754-
), \
755-
$(wildcard $(S)src/test/*fail/*.rs test/*fail/*.rc)) \
756-
$(S)src/test/bench/shootout/fannkuchredux.rs \
757-
$(S)src/test/bench/shootout/fasta.rs \
758-
$(S)src/test/bench/shootout/binarytrees.rs \
759-
$(wildcard $(S)src/test/bench/99-bottles/*rs)
571+
TEST_XFAILS_BOOT = $(shell grep \
572+
--recursive \
573+
--files-with-matches \
574+
--include=*.rs --include=*.rc \
575+
xfail-boot $(S)src/test)
576+
577+
TEST_XFAILS_STAGE0 = $(shell grep \
578+
--recursive \
579+
--files-with-matches \
580+
--include=*.rs --include=*.rc \
581+
xfail-stage0 $(S)src/test)
760582

761583
ifdef MINGW_CROSS
762584
TEST_XFAILS_BOOT += $(S)src/test/run-pass/native-mod.rc
@@ -767,106 +589,106 @@ TEST_XFAILS_BOOT += $(S)src/test/run-pass/native-mod.rc
767589
TEST_XFAILS_STAGE0 += $(S)src/test/run-pass/native-mod.rc
768590
endif
769591

770-
BENCH_RS := $(wildcard $(S)src/test/bench/shootout/*.rs) \
592+
BENCH_RS = $(wildcard $(S)src/test/bench/shootout/*.rs) \
771593
$(wildcard $(S)src/test/bench/99-bottles/*.rs)
772-
RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc)
773-
RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs) $(BENCH_RS)
774-
RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc)
775-
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
776-
CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
777-
CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
594+
RPASS_RC = $(wildcard $(S)src/test/run-pass/*.rc)
595+
RPASS_RS = $(wildcard $(S)src/test/run-pass/*.rs) $(BENCH_RS)
596+
RFAIL_RC = $(wildcard $(S)src/test/run-fail/*.rc)
597+
RFAIL_RS = $(wildcard $(S)src/test/run-fail/*.rs)
598+
CFAIL_RC = $(wildcard $(S)src/test/compile-fail/*.rc)
599+
CFAIL_RS = $(wildcard $(S)src/test/compile-fail/*.rs)
778600

779601
ifdef CHECK_XFAILS
780-
TEST_RPASS_CRATES_BOOT := $(filter $(TEST_XFAILS_BOOT), $(RPASS_RC))
781-
TEST_RPASS_CRATES_STAGE0 := $(filter $(TEST_XFAILS_STAGE0), $(RPASS_RC))
782-
TEST_RPASS_SOURCES_BOOT := $(filter $(TEST_XFAILS_BOOT), $(RPASS_RS))
783-
TEST_RPASS_SOURCES_STAGE0 := $(filter $(TEST_XFAILS_STAGE0), $(RPASS_RS))
602+
TEST_RPASS_CRATES_BOOT = $(filter $(TEST_XFAILS_BOOT), $(RPASS_RC))
603+
TEST_RPASS_CRATES_STAGE0 = $(filter $(TEST_XFAILS_STAGE0), $(RPASS_RC))
604+
TEST_RPASS_SOURCES_BOOT = $(filter $(TEST_XFAILS_BOOT), $(RPASS_RS))
605+
TEST_RPASS_SOURCES_STAGE0 = $(filter $(TEST_XFAILS_STAGE0), $(RPASS_RS))
784606
else
785-
TEST_RPASS_CRATES_BOOT := $(filter-out $(TEST_XFAILS_BOOT), $(RPASS_RC))
786-
TEST_RPASS_CRATES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(RPASS_RC))
787-
TEST_RPASS_SOURCES_BOOT := $(filter-out $(TEST_XFAILS_BOOT), $(RPASS_RS))
788-
TEST_RPASS_SOURCES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(RPASS_RS))
607+
TEST_RPASS_CRATES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(RPASS_RC))
608+
TEST_RPASS_CRATES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RPASS_RC))
609+
TEST_RPASS_SOURCES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(RPASS_RS))
610+
TEST_RPASS_SOURCES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RPASS_RS))
789611
endif
790612

791-
TEST_RPASS_EXES_BOOT := \
613+
TEST_RPASS_EXES_BOOT = \
792614
$(subst $(S)src/,,$(TEST_RPASS_CRATES_BOOT:.rc=.boot$(X))) \
793615
$(subst $(S)src/,,$(TEST_RPASS_SOURCES_BOOT:.rs=.boot$(X)))
794-
TEST_RPASS_EXES_STAGE0 := \
616+
TEST_RPASS_EXES_STAGE0 = \
795617
$(subst $(S)src/,,$(TEST_RPASS_CRATES_STAGE0:.rc=.stage0$(X))) \
796618
$(subst $(S)src/,,$(TEST_RPASS_SOURCES_STAGE0:.rs=.stage0$(X)))
797619

798-
TEST_RPASS_OUTS_BOOT := \
620+
TEST_RPASS_OUTS_BOOT = \
799621
$(TEST_RPASS_EXES_BOOT:.boot$(X)=.boot.out)
800-
TEST_RPASS_OUTS_STAGE0 := \
622+
TEST_RPASS_OUTS_STAGE0 = \
801623
$(TEST_RPASS_EXES_STAGE0:.stage0$(X)=.stage0.out)
802624

803-
TEST_RPASS_TMPS_BOOT := \
625+
TEST_RPASS_TMPS_BOOT = \
804626
$(TEST_RPASS_EXES_BOOT:.boot$(X)=.boot$(X).tmp)
805-
TEST_RPASS_TMPS_STAGE0 := \
627+
TEST_RPASS_TMPS_STAGE0 = \
806628
$(TEST_RPASS_EXES_STAGE0:.stage0$(X)=.stage0$(X).tmp)
807629

808630

809-
TEST_RFAIL_CRATES_BOOT := $(filter-out $(TEST_XFAILS_BOOT), $(RFAIL_RC))
810-
TEST_RFAIL_CRATES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(RFAIL_RC))
811-
TEST_RFAIL_SOURCES_BOOT := $(filter-out $(TEST_XFAILS_BOOT), $(RFAIL_RS))
812-
TEST_RFAIL_SOURCES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(RFAIL_RS))
631+
TEST_RFAIL_CRATES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(RFAIL_RC))
632+
TEST_RFAIL_CRATES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RFAIL_RC))
633+
TEST_RFAIL_SOURCES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(RFAIL_RS))
634+
TEST_RFAIL_SOURCES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(RFAIL_RS))
813635

814-
TEST_RFAIL_EXES_BOOT := \
636+
TEST_RFAIL_EXES_BOOT = \
815637
$(subst $(S)src/,,$(TEST_RFAIL_CRATES_BOOT:.rc=.boot$(X))) \
816638
$(subst $(S)src/,,$(TEST_RFAIL_SOURCES_BOOT:.rs=.boot$(X)))
817-
TEST_RFAIL_EXES_STAGE0 := \
639+
TEST_RFAIL_EXES_STAGE0 = \
818640
$(subst $(S)src/,,$(TEST_RFAIL_CRATES_STAGE0:.rc=.stage0$(X))) \
819641
$(subst $(S)src/,,$(TEST_RFAIL_SOURCES_STAGE0:.rs=.stage0$(X)))
820642

821-
TEST_RFAIL_OUTS_BOOT := \
643+
TEST_RFAIL_OUTS_BOOT = \
822644
$(TEST_RFAIL_EXES_BOOT:.boot$(X)=.boot.out)
823-
TEST_RFAIL_OUTS_STAGE0 := \
645+
TEST_RFAIL_OUTS_STAGE0 = \
824646
$(TEST_RFAIL_EXES_STAGE0:.stage0$(X)=.stage0.out)
825647

826-
TEST_RFAIL_TMPS_BOOT := \
648+
TEST_RFAIL_TMPS_BOOT = \
827649
$(TEST_RFAIL_EXES_BOOT:.boot$(X)=.boot$(X).tmp)
828-
TEST_RFAIL_TMPS_STAGE0 := \
650+
TEST_RFAIL_TMPS_STAGE0 = \
829651
$(TEST_RFAIL_EXES_STAGE0:.stage0$(X)=.stage0$(X).tmp)
830652

831653

832-
TEST_CFAIL_CRATES_BOOT := $(filter-out $(TEST_XFAILS_BOOT), $(CFAIL_RC))
833-
TEST_CFAIL_CRATES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RC))
834-
TEST_CFAIL_SOURCES_BOOT := $(filter-out $(TEST_XFAILS_BOOT), $(CFAIL_RS))
835-
TEST_CFAIL_SOURCES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RS))
654+
TEST_CFAIL_CRATES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(CFAIL_RC))
655+
TEST_CFAIL_CRATES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RC))
656+
TEST_CFAIL_SOURCES_BOOT = $(filter-out $(TEST_XFAILS_BOOT), $(CFAIL_RS))
657+
TEST_CFAIL_SOURCES_STAGE0 = $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RS))
836658

837-
TEST_CFAIL_EXES_BOOT := \
659+
TEST_CFAIL_EXES_BOOT = \
838660
$(subst $(S)src/,,$(TEST_CFAIL_CRATES_BOOT:.rc=.boot$(X))) \
839661
$(subst $(S)src/,,$(TEST_CFAIL_SOURCES_BOOT:.rs=.boot$(X)))
840-
TEST_CFAIL_EXES_STAGE0 := \
662+
TEST_CFAIL_EXES_STAGE0 = \
841663
$(subst $(S)src/,,$(TEST_CFAIL_CRATES_STAGE0:.rc=.stage0$(X))) \
842664
$(subst $(S)src/,,$(TEST_CFAIL_SOURCES_STAGE0:.rs=.stage0$(X)))
843665

844-
TEST_CFAIL_OUTS_BOOT := \
666+
TEST_CFAIL_OUTS_BOOT = \
845667
$(TEST_CFAIL_EXES_BOOT:.boot$(X)=.boot.out)
846-
TEST_CFAIL_OUTS_STAGE0 := \
668+
TEST_CFAIL_OUTS_STAGE0 = \
847669
$(TEST_CFAIL_EXES_STAGE0:.stage0$(X)=.stage0.out)
848670

849-
TEST_CFAIL_TMPS_BOOT := \
671+
TEST_CFAIL_TMPS_BOOT = \
850672
$(TEST_CFAIL_EXES_BOOT:.boot$(X)=.boot$(X).tmp)
851-
TEST_CFAIL_TMPS_STAGE0 := \
673+
TEST_CFAIL_TMPS_STAGE0 = \
852674
$(TEST_CFAIL_EXES_STAGE0:.stage0$(X)=.stage0$(X).tmp)
853675

854676

855-
ALL_TEST_CRATES := $(TEST_CFAIL_CRATES_BOOT) \
677+
ALL_TEST_CRATES = $(TEST_CFAIL_CRATES_BOOT) \
856678
$(TEST_RFAIL_CRATES_BOOT) \
857679
$(TEST_RPASS_CRATES_BOOT) \
858680
$(TEST_CFAIL_CRATES_STAGE0) \
859681
$(TEST_RFAIL_CRATES_STAGE0) \
860682
$(TEST_RPASS_CRATES_STAGE0)
861683

862-
ALL_TEST_SOURCES := $(TEST_CFAIL_SOURCES_BOOT) \
684+
ALL_TEST_SOURCES = $(TEST_CFAIL_SOURCES_BOOT) \
863685
$(TEST_RFAIL_SOURCES_BOOT) \
864686
$(TEST_RPASS_SOURCES_BOOT) \
865687
$(TEST_CFAIL_SOURCES_STAGE0) \
866688
$(TEST_RFAIL_SOURCES_STAGE0) \
867689
$(TEST_RPASS_SOURCES_STAGE0)
868690

869-
ALL_TEST_INPUTS := $(wildcard $(S)src/test/*/*.rs \
691+
ALL_TEST_INPUTS = $(wildcard $(S)src/test/*/*.rs \
870692
$(S)src/test/*/*/*.rs \
871693
$(S)src/test/*/*.rc)
872694

@@ -1131,7 +953,7 @@ PKG_3RDPARTY := rt/valgrind.h rt/memcheck.h \
1131953
rt/bigint/bigint.h rt/bigint/bigint_int.cpp \
1132954
rt/bigint/bigint_ext.cpp rt/bigint/low_primes.h
1133955

1134-
PKG_FILES :=\
956+
PKG_FILES = \
1135957
$(wildcard $(S)src/etc/*.*) \
1136958
$(S)LICENSE.txt $(S)README \
1137959
$(S)configure $(S)Makefile.in \

‎trunk/src/test/bench/99-bottles/99bob-iter.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// xfail-stage0
12
/* -*- mode:rust;indent-tabs-mode:nil -*-
23
* Implementation of 99 Bottles of Beer
34
* http://99-bottles-of-beer.net/

‎trunk/src/test/bench/99-bottles/99bob-pattern.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// xfail-stage0
12
/* -*- mode:rust;indent-tabs-mode:nil -*-
23
* Implementation of 99 Bottles of Beer
34
* http://99-bottles-of-beer.net/

‎trunk/src/test/bench/99-bottles/99bob-simple.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// xfail-stage0
12
/* -*- mode:rust;indent-tabs-mode:nil -*-
23
* Implementation of 99 Bottles of Beer
34
* http://99-bottles-of-beer.net/

‎trunk/src/test/bench/99-bottles/99bob-tail.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// xfail-stage0
12
/* -*- mode:rust;indent-tabs-mode:nil -*-
23
* Implementation of 99 Bottles of Beer
34
* http://99-bottles-of-beer.net/

‎trunk/src/test/bench/shootout/binarytrees.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// xfail-stage0
12
use std;
23

34
import std._int;

0 commit comments

Comments
 (0)