Skip to content

Commit 7c07329

Browse files
graydongraydon
committed
---
yaml --- r: 1762 b: refs/heads/master c: 68d76c2 h: refs/heads/master v: v3
1 parent cba4422 commit 7c07329

File tree

2 files changed

+318
-1
lines changed

2 files changed

+318
-1
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: f3057244a6b5f3e5fbfbcf0a74e285cc7704027d
2+
refs/heads/master: 68d76c21c540afba3e76b177100c1d0787c9311c

‎trunk/Makefile.in

Lines changed: 317 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,323 @@ llvmext/%.o: llvmext/%.cpp $(MKFILES)
474474
$(Q)ocamllex$(OPT) -q -o $@ $<
475475

476476

477+
######################################################################
478+
# Testing variables
479+
######################################################################
480+
481+
# Temporarily xfail tests broken by the nominal-tags change.
482+
483+
NOMINAL_TAG_XFAILS := $(S)src/test/run-pass/mlist.rs
484+
485+
# Temporarily xfail tests broken by the constant-tags change.
486+
487+
CONST_TAG_XFAILS := $(S)src/test/run-pass/generic-tag.rs
488+
489+
# Temporarily xfail some of the task tests, while debugging the
490+
# overhauled inter-domain messaging system.
491+
492+
TASK_XFAILS := $(addprefix $(S)src/test/run-pass/, \
493+
task-comm-8.rs \
494+
task-comm-10.rs \
495+
task-comm-15.rs \
496+
task-comm-12.rs \
497+
task-comm-2.rs \
498+
task-comm-9.rs \
499+
task-life-0.rs \
500+
alt-type-simple.rs \
501+
many.rs)
502+
503+
TEST_XFAILS_BOOT := $(TASK_XFAILS) \
504+
$(NOMINAL_TAG_XFAILS) \
505+
$(CONST_TAG_XFAILS) \
506+
$(addprefix $(S)src/test/run-pass/, \
507+
arith-unsigned.rs \
508+
box-compare.rs \
509+
child-outlives-parent.rs \
510+
clone-with-exterior.rs \
511+
constrained-type.rs \
512+
destructor-ordering.rs \
513+
obj-as.rs \
514+
vec-slice.rs \
515+
fn-lval.rs \
516+
generic-bind-2.rs \
517+
generic-fn-box.rs \
518+
generic-tup.rs \
519+
iter-ret.rs \
520+
leak-tag-copy.rs \
521+
lib-io.rs \
522+
maybe-mutable.rs \
523+
mlist-cycle.rs \
524+
obj-as.rs \
525+
seq-compare.rs \
526+
task-comm.rs \
527+
task-comm-3.rs \
528+
vec-slice.rs \
529+
while-and-do-while.rs) \
530+
$(addprefix $(S)src/test/run-fail/, \
531+
task-comm-14.rs) \
532+
$(addprefix $(S)src/test/compile-fail/, \
533+
bad-expr-path.rs \
534+
import.rs \
535+
import2.rs \
536+
import3.rs \
537+
import4.rs \
538+
bad-recv.rs \
539+
bad-send.rs \
540+
infinite-vec-type-recursion.rs \
541+
tail-non-call.rs \
542+
writing-through-read-alias.rs)
543+
544+
TEST_XFAILS_STAGE0 := $(addprefix $(S)src/test/run-pass/, \
545+
acyclic-unwind.rs \
546+
alt-pattern-drop.rs \
547+
alt-type-simple.rs \
548+
basic-1.rs \
549+
basic-2.rs \
550+
basic.rs \
551+
child-outlives-parent.rs \
552+
clone-with-exterior.rs \
553+
comm.rs \
554+
constrained-type.rs \
555+
destructor-ordering.rs \
556+
iter-ret.rs \
557+
lazychan.rs \
558+
lib-bitv.rs \
559+
lib-deque.rs \
560+
lib-int.rs \
561+
lib-io.rs \
562+
lib-map.rs \
563+
lib-rand.rs \
564+
lib-sha1.rs \
565+
lib-sort.rs \
566+
lib-str.rs \
567+
lib-str-buf.rs \
568+
lib-task.rs \
569+
lib-uint.rs \
570+
lib-vec-str-conversions.rs \
571+
lib-vec.rs \
572+
many.rs \
573+
mlist-cycle.rs \
574+
mlist.rs \
575+
mutable-alias-vec.rs \
576+
obj-as.rs \
577+
obj-dtor.rs \
578+
pred.rs \
579+
preempt.rs \
580+
rt-circular-buffer.rs \
581+
size-and-align.rs \
582+
spawn-fn.rs \
583+
spawn-module-qualified.rs \
584+
spawn.rs \
585+
str-append.rs \
586+
syntax-extension-fmt.rs \
587+
syntax-extension-shell.rs \
588+
task-comm-0.rs \
589+
task-comm-1.rs \
590+
task-comm-10.rs \
591+
task-comm-11.rs \
592+
task-comm-12.rs \
593+
task-comm-13-thread.rs \
594+
task-comm-13.rs \
595+
task-comm-15.rs \
596+
task-comm-2.rs \
597+
task-comm-3.rs \
598+
task-comm-4.rs \
599+
task-comm-5.rs \
600+
task-comm-6.rs \
601+
task-comm-7.rs \
602+
task-comm-8.rs \
603+
task-comm-9.rs \
604+
task-comm.rs \
605+
task-killjoin.rs \
606+
task-life-0.rs \
607+
threads.rs \
608+
type-sizes.rs \
609+
typestate-cfg-nesting.rs \
610+
user.rs \
611+
utf8.rs \
612+
vec-alloc-append.rs \
613+
vec-append.rs \
614+
vec-slice.rs \
615+
while-with-break.rs \
616+
yield.rs \
617+
yield2.rs \
618+
multi.rc \
619+
native-mod.rc \
620+
native.rc \
621+
) \
622+
$(filter-out \
623+
$(addprefix $(S)src/test/compile-fail/, \
624+
alt-tag-nullary.rs \
625+
alt-tag-unary.rs \
626+
arg-count-mismatch.rs \
627+
arg-type-mismatch.rs \
628+
bad-expr-path.rs \
629+
bad-expr-path2.rs \
630+
bogus-tag.rs \
631+
fru-extra-field.rs \
632+
import.rs \
633+
import2.rs \
634+
import3.rs \
635+
import4.rs \
636+
import-loop.rs \
637+
import-loop-2.rs \
638+
multiline-comment-line-tracking.rs \
639+
output-type-mismatch.rs \
640+
rec-missing-fields.rs \
641+
reserved-dec.rs \
642+
reserved-f128.rs \
643+
reserved-f16.rs \
644+
reserved-f80.rs \
645+
reserved-m128.rs \
646+
reserved-m32.rs \
647+
reserved-m64.rs \
648+
tail-non-call.rs \
649+
tail-typeck.rs \
650+
type-shadow.rs \
651+
while-type-error.rs \
652+
wrong-ret-type.rs \
653+
), \
654+
$(wildcard $(S)src/test/*fail/*.rs test/*fail/*.rc)) \
655+
$(S)src/test/bench/shootout/fannkuchredux.rs \
656+
$(S)src/test/bench/shootout/fasta.rs \
657+
$(S)src/test/bench/shootout/binarytrees.rs \
658+
$(wildcard $(S)src/test/bench/99-bottles/*rs)
659+
660+
ifdef MINGW_CROSS
661+
TEST_XFAILS_BOOT += $(S)src/test/run-pass/native-mod.rc
662+
TEST_XFAILS_STAGE0 += $(S)src/test/run-pass/native-mod.rc
663+
endif
664+
ifdef CFG_WINDOWSY
665+
TEST_XFAILS_BOOT += $(S)src/test/run-pass/native-mod.rc
666+
TEST_XFAILS_STAGE0 += $(S)src/test/run-pass/native-mod.rc
667+
endif
668+
669+
BENCH_RS := $(wildcard $(S)src/test/bench/shootout/*.rs) \
670+
$(wildcard $(S)src/test/bench/99-bottles/*.rs)
671+
RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc)
672+
RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs) $(BENCH_RS)
673+
RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc)
674+
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
675+
CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
676+
CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
677+
678+
ifdef CHECK_XFAILS
679+
TEST_RPASS_CRATES_BOOT := $(filter $(TEST_XFAILS_BOOT), $(RPASS_RC))
680+
TEST_RPASS_CRATES_STAGE0 := $(filter $(TEST_XFAILS_STAGE0), $(RPASS_RC))
681+
TEST_RPASS_SOURCES_BOOT := $(filter $(TEST_XFAILS_BOOT), $(RPASS_RS))
682+
TEST_RPASS_SOURCES_STAGE0 := $(filter $(TEST_XFAILS_STAGE0), $(RPASS_RS))
683+
else
684+
TEST_RPASS_CRATES_BOOT := $(filter-out $(TEST_XFAILS_BOOT), $(RPASS_RC))
685+
TEST_RPASS_CRATES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(RPASS_RC))
686+
TEST_RPASS_SOURCES_BOOT := $(filter-out $(TEST_XFAILS_BOOT), $(RPASS_RS))
687+
TEST_RPASS_SOURCES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(RPASS_RS))
688+
endif
689+
690+
TEST_RPASS_EXES_BOOT := \
691+
$(TEST_RPASS_CRATES_BOOT:.rc=.boot$(X)) \
692+
$(TEST_RPASS_SOURCES_BOOT:.rs=.boot$(X))
693+
TEST_RPASS_EXES_STAGE0 := \
694+
$(TEST_RPASS_CRATES_STAGE0:.rc=.rustc$(X)) \
695+
$(TEST_RPASS_SOURCES_STAGE0:.rs=.rustc$(X))
696+
697+
TEST_RPASS_OUTS_BOOT := \
698+
$(TEST_RPASS_EXES_BOOT:.boot$(X)=.boot.out)
699+
TEST_RPASS_OUTS_STAGE0 := \
700+
$(TEST_RPASS_EXES_STAGE0:.rustc$(X)=.rustc.out)
701+
702+
TEST_RPASS_TMPS_BOOT := \
703+
$(TEST_RPASS_EXES_BOOT:.boot$(X)=.boot$(X).tmp)
704+
TEST_RPASS_TMPS_STAGE0 := \
705+
$(TEST_RPASS_EXES_STAGE0:.rustc$(X)=.rustc$(X).tmp)
706+
707+
708+
TEST_RFAIL_CRATES_BOOT := $(filter-out $(TEST_XFAILS_BOOT), $(RFAIL_RC))
709+
TEST_RFAIL_CRATES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(RFAIL_RC))
710+
TEST_RFAIL_SOURCES_BOOT := $(filter-out $(TEST_XFAILS_BOOT), $(RFAIL_RS))
711+
TEST_RFAIL_SOURCES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(RFAIL_RS))
712+
713+
TEST_RFAIL_EXES_BOOT := \
714+
$(TEST_RFAIL_CRATES_BOOT:.rc=.boot$(X)) \
715+
$(TEST_RFAIL_SOURCES_BOOT:.rs=.boot$(X))
716+
TEST_RFAIL_EXES_STAGE0 := \
717+
$(TEST_RFAIL_CRATES_STAGE0:.rc=.rustc$(X)) \
718+
$(TEST_RFAIL_SOURCES_STAGE0:.rs=.rustc$(X))
719+
720+
TEST_RFAIL_OUTS_BOOT := \
721+
$(TEST_RFAIL_EXES_BOOT:.boot$(X)=.boot.out)
722+
TEST_RFAIL_OUTS_STAGE0 := \
723+
$(TEST_RFAIL_EXES_STAGE0:.rustc$(X)=.rustc.out)
724+
725+
TEST_RFAIL_TMPS_BOOT := \
726+
$(TEST_RFAIL_EXES_BOOT:.boot$(X)=.boot$(X).tmp)
727+
TEST_RFAIL_TMPS_STAGE0 := \
728+
$(TEST_RFAIL_EXES_STAGE0:.rustc$(X)=.rustc$(X).tmp)
729+
730+
731+
TEST_CFAIL_CRATES_BOOT := $(filter-out $(TEST_XFAILS_BOOT), $(CFAIL_RC))
732+
TEST_CFAIL_CRATES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RC))
733+
TEST_CFAIL_SOURCES_BOOT := $(filter-out $(TEST_XFAILS_BOOT), $(CFAIL_RS))
734+
TEST_CFAIL_SOURCES_STAGE0 := $(filter-out $(TEST_XFAILS_STAGE0), $(CFAIL_RS))
735+
736+
TEST_CFAIL_EXES_BOOT := \
737+
$(TEST_CFAIL_CRATES_BOOT:.rc=.boot$(X)) \
738+
$(TEST_CFAIL_SOURCES_BOOT:.rs=.boot$(X))
739+
TEST_CFAIL_EXES_STAGE0 := \
740+
$(TEST_CFAIL_CRATES_STAGE0:.rc=.rustc$(X)) \
741+
$(TEST_CFAIL_SOURCES_STAGE0:.rs=.rustc$(X))
742+
743+
TEST_CFAIL_OUTS_BOOT := \
744+
$(TEST_CFAIL_EXES_BOOT:.boot$(X)=.boot.out)
745+
TEST_CFAIL_OUTS_STAGE0 := \
746+
$(TEST_CFAIL_EXES_STAGE0:.rustc$(X)=.rustc.out)
747+
748+
TEST_CFAIL_TMPS_BOOT := \
749+
$(TEST_CFAIL_EXES_BOOT:.boot$(X)=.boot$(X).tmp)
750+
TEST_CFAIL_TMPS_STAGE0 := \
751+
$(TEST_CFAIL_EXES_STAGE0:.rustc$(X)=.rustc$(X).tmp)
752+
753+
754+
ALL_TEST_CRATES := $(TEST_CFAIL_CRATES_BOOT) \
755+
$(TEST_RFAIL_CRATES_BOOT) \
756+
$(TEST_RPASS_CRATES_BOOT) \
757+
$(TEST_CFAIL_CRATES_STAGE0) \
758+
$(TEST_RFAIL_CRATES_STAGE0) \
759+
$(TEST_RPASS_CRATES_STAGE0)
760+
761+
ALL_TEST_SOURCES := $(TEST_CFAIL_SOURCES_BOOT) \
762+
$(TEST_RFAIL_SOURCES_BOOT) \
763+
$(TEST_RPASS_SOURCES_BOOT) \
764+
$(TEST_CFAIL_SOURCES_STAGE0) \
765+
$(TEST_RFAIL_SOURCES_STAGE0) \
766+
$(TEST_RPASS_SOURCES_STAGE0)
767+
768+
ALL_TEST_INPUTS := $(wildcard $(S)src/test/*/*.rs \
769+
$(S)src/test/*/*/*.rs \
770+
$(S)src/test/*/*.rc)
771+
772+
# The test suite currently relies on logging to validate results so
773+
# make sure that logging uses the default configuration
774+
unexport RUST_LOG
775+
776+
777+
check_nocompile: $(TEST_CFAIL_OUTS_BOOT) \
778+
$(TEST_CFAIL_OUTS_STAGE0)
779+
780+
check: tidy \
781+
$(TEST_RPASS_EXES_BOOT) $(TEST_RFAIL_EXES_BOOT) \
782+
$(TEST_RPASS_OUTS_BOOT) $(TEST_RFAIL_OUTS_BOOT) \
783+
$(TEST_CFAIL_OUTS_BOOT) \
784+
$(TEST_RPASS_EXES_STAGE0) $(TEST_RFAIL_EXES_STAGE0) \
785+
$(TEST_RPASS_OUTS_STAGE0) $(TEST_RFAIL_OUTS_STAGE0) \
786+
$(TEST_CFAIL_OUTS_STAGE0)
787+
788+
789+
compile-check: tidy \
790+
$(TEST_RPASS_EXES_BOOT) $(TEST_RFAIL_EXES_BOOT) \
791+
$(TEST_RPASS_EXES_STAGE0) $(TEST_RFAIL_EXES_STAGE0)
792+
793+
477794
######################################################################
478795
# Testing rules
479796
######################################################################

0 commit comments

Comments
 (0)