Skip to content

Commit b2bb2f5

Browse files
committed
1 parent b48bc9e commit b2bb2f5

File tree

297 files changed

+15
-452
lines changed

Some content is hidden

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

297 files changed

+15
-452
lines changed

mk/tests.mk

Lines changed: 4 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,9 @@ check-ref: cleantestlibs cleantmptestlogs check-stage2-rpass \
187187
check-docs: cleantestlibs cleantmptestlogs check-stage2-docs
188188
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
189189

190+
# NOTE: Remove after reprogramming windows bots
191+
check-fast: check-lite
192+
190193
.PHONY: cleantmptestlogs cleantestlibs
191194

192195
cleantmptestlogs:
@@ -844,69 +847,9 @@ $(foreach crate,$(TEST_CRATES), \
844847
$(eval $(call DEF_CHECK_CRATE,$(crate))))
845848

846849
######################################################################
847-
# check-fast rules
850+
# RMAKE rules
848851
######################################################################
849852

850-
FT := run_pass_stage2
851-
FT_LIB := $(call CFG_LIB_NAME_$(CFG_BUILD),$(FT))
852-
FT_DRIVER := $(FT)_driver
853-
854-
GENERATED += tmp/$(FT).rc tmp/$(FT_DRIVER).rs
855-
856-
tmp/$(FT).rc tmp/$(FT_DRIVER).rs: \
857-
$(RPASS_TESTS) \
858-
$(S)src/etc/combine-tests.py
859-
@$(call E, check: building combined stage2 test runner)
860-
$(Q)$(CFG_PYTHON) $(S)src/etc/combine-tests.py
861-
862-
define DEF_CHECK_FAST_FOR_T_H
863-
# $(1) unused
864-
# $(2) target triple
865-
# $(3) host triple
866-
867-
$$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB): \
868-
tmp/$$(FT).rc \
869-
$$(SREQ2_T_$(2)_H_$(3))
870-
@$$(call E, oxidize: $$@)
871-
$$(STAGE2_T_$(2)_H_$(3)) --crate-type=dylib --out-dir $$(@D) $$< \
872-
-L "$$(RT_OUTPUT_DIR_$(2))"
873-
874-
$(3)/test/$$(FT_DRIVER)-$(2)$$(X_$(2)): \
875-
tmp/$$(FT_DRIVER).rs \
876-
$$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB) \
877-
$$(SREQ2_T_$(2)_H_$(3))
878-
@$$(call E, oxidize: $$@ $$<)
879-
$$(STAGE2_T_$(2)_H_$(3)) -o $$@ $$< \
880-
-L "$$(RT_OUTPUT_DIR_$(2))"
881-
882-
$(3)/test/$$(FT_DRIVER)-$(2).out: \
883-
$(3)/test/$$(FT_DRIVER)-$(2)$$(X_$(2)) \
884-
$$(SREQ2_T_$(2)_H_$(3))
885-
$$(Q)$$(call CFG_RUN_TEST_$(2),$$<,$(2),$(3)) \
886-
--logfile tmp/$$(FT_DRIVER)-$(2).log
887-
888-
check-fast-T-$(2)-H-$(3): \
889-
$(3)/test/$$(FT_DRIVER)-$(2).out
890-
891-
endef
892-
893-
$(foreach host,$(CFG_HOST), \
894-
$(eval $(foreach target,$(CFG_TARGET), \
895-
$(eval $(call DEF_CHECK_FAST_FOR_T_H,,$(target),$(host))))))
896-
897-
check-fast: tidy check-fast-H-$(CFG_BUILD) \
898-
$(foreach crate,$(TARGET_CRATES),check-stage2-$(crate))
899-
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
900-
901-
define DEF_CHECK_FAST_FOR_H
902-
903-
check-fast-H-$(1): check-fast-T-$(1)-H-$(1)
904-
905-
endef
906-
907-
$(foreach host,$(CFG_HOST), \
908-
$(eval $(call DEF_CHECK_FAST_FOR_H,$(host))))
909-
910853
RMAKE_TESTS := $(shell ls -d $(S)src/test/run-make/*/)
911854
RMAKE_TESTS := $(RMAKE_TESTS:$(S)src/test/run-make/%/=%)
912855

src/etc/combine-tests.py

Lines changed: 0 additions & 93 deletions
This file was deleted.

src/etc/maketest.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
import os
1313
import sys
1414

15+
# FIXME #12303 these tests are broken on windows
16+
if os.name == 'nt':
17+
print 'ignoring make tests on windows'
18+
sys.exit(0)
19+
1520
os.putenv('RUSTC', os.path.abspath(sys.argv[2]))
1621
os.putenv('TMPDIR', os.path.abspath(sys.argv[3]))
1722
os.putenv('CC', sys.argv[4])

src/test/auxiliary/crateresolve7x.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast
1211
// aux-build:crateresolve_calories-1.rs
1312
// aux-build:crateresolve_calories-2.rs
1413

src/test/auxiliary/issue-2414-b.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast
1211

1312
#[crate_id="b#0.1"];
1413
#[crate_type = "lib"];

src/test/auxiliary/issue-9906.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast windows doesn't like extern crate
1211
// aux-build:issue-9906.rs
1312

1413
pub use other::FooBar;

src/test/compile-fail/ambig_impl_2_exe.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast aux-build
1211
// aux-build:ambig_impl_2_lib.rs
1312
extern crate ambig_impl_2_lib;
1413
use ambig_impl_2_lib::me;

src/test/compile-fail/asm-in-bad-modifier.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast #[feature] doesn't work with check-fast
1211
#[feature(asm)];
1312

1413
fn foo(x: int) { info!("{}", x); }

src/test/compile-fail/asm-out-assign-imm.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast #[feature] doesn't work with check-fast
1211
#[feature(asm)];
1312

1413
fn foo(x: int) { info!("{}", x); }

src/test/compile-fail/asm-out-no-modifier.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast #[feature] doesn't work with check-fast
1211
#[feature(asm)];
1312

1413
fn foo(x: int) { info!("{}", x); }

src/test/compile-fail/asm-out-read-uninit.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast #[feature] doesn't work with check-fast
1211
#[feature(asm)];
1312

1413
fn foo(x: int) { info!("{}", x); }

src/test/compile-fail/builtin-superkinds-in-metadata.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast
1211

1312
// aux-build:trait_superkinds_in_metadata.rs
1413

src/test/compile-fail/coherence_inherent_cc.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast
1211
// aux-build:coherence_inherent_cc_lib.rs
1312

1413
// Tests that methods that implement a trait cannot be invoked

src/test/compile-fail/crateresolve5.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast
1211
// aux-build:crateresolve5-1.rs
1312
// aux-build:crateresolve5-2.rs
1413

src/test/compile-fail/functional-struct-update-noncopyable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
// issue 7327
1212

13-
// ignore-fast #7103
1413
extern crate sync;
14+
1515
use sync::Arc;
1616

1717
struct A { y: Arc<int>, x: Arc<int> }

src/test/compile-fail/gated-non-ascii-idents.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast feature doesn't work.
1211

1312
#[feature(struct_variant)];
1413

src/test/compile-fail/gated-trace_macros.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast feature doesn't work.
1211

1312
fn main() {
1413
trace_macros!(true); //~ ERROR: `trace_macros` is not stable

src/test/compile-fail/lint-stability.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast aux-build
1211
// aux-build:lint_stability.rs
1312

1413
#[feature(globs)];

src/test/compile-fail/private-method-cross-crate.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast
1211
// aux-build:cci_class_5.rs
1312
extern crate cci_class_5;
1413
use cci_class_5::kitties::cat;

src/test/compile-fail/redundant-link-args.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast
1211
// ignore-test
1312

1413
// error-pattern:library 'm' already added: can't specify link_args.

src/test/compile-fail/xc-private-method.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast
1211
// aux-build:xc_private_method_lib.rs
1312

1413
extern crate xc_private_method_lib;

src/test/compile-fail/xc-private-method2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast
1211
// aux-build:xc_private_method_lib.rs
1312

1413
extern crate xc_private_method_lib;

src/test/pretty/raw-str-nonexpr.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast #[feature] doesn't work with check-fast
1211
// pp-exact
1312

1413
#[feature(asm)];

src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// aux-build:macro_crate_outlive_expansion_phase.rs
1212
// ignore-stage1
13-
// ignore-fast
1413
// ignore-android
1514

1615
#[feature(phase)];

src/test/run-pass-fulldeps/macro-crate.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// aux-build:macro_crate_test.rs
1212
// ignore-stage1
13-
// ignore-fast
1413
// ignore-android
1514

1615
#[feature(phase)];

src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast
1211
// ignore-android
1312
#[feature(quote)];
1413
#[deny(unused_variable)];

src/test/run-pass-fulldeps/syntax-extension-fourcc.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast Feature gating doesn't work
1211
// ignore-stage1
1312
// ignore-pretty
1413
// ignore-cross-compile

src/test/run-pass/anon-extern-mod-cross-crate-2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast
1211
// ignore-pretty
1312
// aux-build:anon-extern-mod-cross-crate-1.rs
1413
extern crate anonexternmod;

src/test/run-pass/anon_trait_static_method_exe.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-fast - check-fast doesn't understand aux-build
1211
// aux-build:anon_trait_static_method_lib.rs
1312

1413
extern crate anon_trait_static_method_lib;

0 commit comments

Comments
 (0)