Skip to content

Commit 072a920

Browse files
brsonalexcrichton
brson
authored and
alexcrichton
committed
Remove check-fast. Closes #4193, #8844, #6330, #7416 
1 parent 31e8f24 commit 072a920

File tree

311 files changed

+172
-465
lines changed

Some content is hidden

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

311 files changed

+172
-465
lines changed

Diff for: ‎mk/tests.mk

+4-61
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,9 @@ check-ref: cleantestlibs cleantmptestlogs check-stage2-rpass \
183183
check-docs: cleantestlibs cleantmptestlogs check-stage2-docs
184184
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
185185

186+
# NOTE: Remove after reprogramming windows bots
187+
check-fast: check-lite
188+
186189
.PHONY: cleantmptestlogs cleantestlibs
187190

188191
cleantmptestlogs:
@@ -875,69 +878,9 @@ $(foreach crate,$(TEST_CRATES), \
875878
$(eval $(call DEF_CHECK_CRATE,$(crate))))
876879

877880
######################################################################
878-
# check-fast rules
881+
# RMAKE rules
879882
######################################################################
880883

881-
FT := run_pass_stage2
882-
FT_LIB := $(call CFG_LIB_NAME_$(CFG_BUILD),$(FT))
883-
FT_DRIVER := $(FT)_driver
884-
885-
GENERATED += tmp/$(FT).rc tmp/$(FT_DRIVER).rs
886-
887-
tmp/$(FT).rc tmp/$(FT_DRIVER).rs: \
888-
$(RPASS_TESTS) \
889-
$(S)src/etc/combine-tests.py
890-
@$(call E, check: building combined stage2 test runner)
891-
$(Q)$(CFG_PYTHON) $(S)src/etc/combine-tests.py
892-
893-
define DEF_CHECK_FAST_FOR_T_H
894-
# $(1) unused
895-
# $(2) target triple
896-
# $(3) host triple
897-
898-
$$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB): \
899-
tmp/$$(FT).rc \
900-
$$(SREQ2_T_$(2)_H_$(3))
901-
@$$(call E, oxidize: $$@)
902-
$$(STAGE2_T_$(2)_H_$(3)) --crate-type=dylib --out-dir $$(@D) $$< \
903-
-L "$$(RT_OUTPUT_DIR_$(2))"
904-
905-
$(3)/test/$$(FT_DRIVER)-$(2)$$(X_$(2)): \
906-
tmp/$$(FT_DRIVER).rs \
907-
$$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB) \
908-
$$(SREQ2_T_$(2)_H_$(3))
909-
@$$(call E, oxidize: $$@ $$<)
910-
$$(STAGE2_T_$(2)_H_$(3)) -o $$@ $$< \
911-
-L "$$(RT_OUTPUT_DIR_$(2))"
912-
913-
$(3)/test/$$(FT_DRIVER)-$(2).out: \
914-
$(3)/test/$$(FT_DRIVER)-$(2)$$(X_$(2)) \
915-
$$(SREQ2_T_$(2)_H_$(3))
916-
$$(Q)$$(call CFG_RUN_TEST_$(2),$$<,$(2),$(3)) \
917-
--logfile tmp/$$(FT_DRIVER)-$(2).log
918-
919-
check-fast-T-$(2)-H-$(3): \
920-
$(3)/test/$$(FT_DRIVER)-$(2).out
921-
922-
endef
923-
924-
$(foreach host,$(CFG_HOST), \
925-
$(eval $(foreach target,$(CFG_TARGET), \
926-
$(eval $(call DEF_CHECK_FAST_FOR_T_H,,$(target),$(host))))))
927-
928-
check-fast: tidy check-fast-H-$(CFG_BUILD) \
929-
$(foreach crate,$(TARGET_CRATES),check-stage2-$(crate))
930-
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
931-
932-
define DEF_CHECK_FAST_FOR_H
933-
934-
check-fast-H-$(1): check-fast-T-$(1)-H-$(1)
935-
936-
endef
937-
938-
$(foreach host,$(CFG_HOST), \
939-
$(eval $(call DEF_CHECK_FAST_FOR_H,$(host))))
940-
941884
RMAKE_TESTS := $(shell ls -d $(S)src/test/run-make/*/)
942885
RMAKE_TESTS := $(RMAKE_TESTS:$(S)src/test/run-make/%/=%)
943886

Diff for: ‎src/etc/combine-tests.py

-91
This file was deleted.

Diff for: ‎src/etc/maketest.py

+5
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])

Diff for: ‎src/test/auxiliary/crateresolve7x.rs

-1
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

Diff for: ‎src/test/auxiliary/issue-2414-b.rs

-1
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"];

Diff for: ‎src/test/auxiliary/issue-9906.rs

-1
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;

Diff for: ‎src/test/compile-fail/ambig_impl_2_exe.rs

-1
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;

Diff for: ‎src/test/compile-fail/asm-in-bad-modifier.rs

-1
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) { println!("{}", x); }

Diff for: ‎src/test/compile-fail/asm-misplaced-option.rs

-1
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
// ignore-android
1312

1413
#![feature(asm)]

Diff for: ‎src/test/compile-fail/asm-out-assign-imm.rs

-1
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) { println!("{}", x); }

Diff for: ‎src/test/compile-fail/asm-out-no-modifier.rs

-1
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) { println!("{}", x); }

Diff for: ‎src/test/compile-fail/asm-out-read-uninit.rs

-1
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) { println!("{}", x); }

Diff for: ‎src/test/compile-fail/builtin-superkinds-in-metadata.rs

-1
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

Diff for: ‎src/test/compile-fail/coherence_inherent_cc.rs

-1
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

Diff for: ‎src/test/compile-fail/crateresolve5.rs

-1
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

Diff for: ‎src/test/compile-fail/functional-struct-update-noncopyable.rs

+1-1
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> }

Diff for: ‎src/test/compile-fail/gated-non-ascii-idents.rs

-1
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

Diff for: ‎src/test/compile-fail/gated-trace_macros.rs

-1
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

Diff for: ‎src/test/compile-fail/lint-stability.rs

-1
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)]

Diff for: ‎src/test/compile-fail/private-method-cross-crate.rs

-1
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;

Diff for: ‎src/test/compile-fail/redundant-link-args.rs

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// ignore-test
12+
13+
// error-pattern:library 'm' already added: can't specify link_args.
14+
15+
/* I think it should undefined to have multiple modules that link in the same
16+
library, but provide different link arguments. Unfortunately we don't track
17+
link_args by module -- they are just appended as discovered into the crate
18+
store -- but for now, it should be an error to provide link_args on a module
19+
that's already been included (with or without link_args). */
20+
21+
#[link_name= "m"]
22+
#[link_args="-foo"] // this could have been elided.
23+
extern {
24+
}
25+
26+
#[link_name= "m"]
27+
#[link_args="-bar"] // this is the actual error trigger.
28+
extern {
29+
}

Diff for: ‎src/test/compile-fail/xc-private-method.rs

-1
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;

Diff for: ‎src/test/compile-fail/xc-private-method2.rs

-1
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;

Diff for: ‎src/test/pretty/raw-str-nonexpr.rs

-1
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)]

Diff for: ‎src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs

-1
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
// ignore-cross-compile #12102
1615

Diff for: ‎src/test/run-pass-fulldeps/macro-crate.rs

-1
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
// ignore-cross-compile #12102
1615

0 commit comments

Comments
 (0)