Auto merge of #24537 - rprichard:fix-parallel-check, r=alexcrichton
This required fixing the `pretty-rpass-full` tests to have the same `$$(CSREQ$(1)_T_$(2)_H_$(3))` dependencies as the `rpass-full` and `cfail-full` tests. It also required fixing the `run-make/simd-ffi` test to use unique names for its output files.
This commit is contained in:
commit
69e47c77b2
18
mk/tests.mk
18
mk/tests.mk
|
@ -753,13 +753,6 @@ PRETTY_DEPS_pretty-rpass-full = $(RPASS_FULL_TESTS)
|
||||||
PRETTY_DEPS_pretty-rfail = $(RFAIL_TESTS)
|
PRETTY_DEPS_pretty-rfail = $(RFAIL_TESTS)
|
||||||
PRETTY_DEPS_pretty-bench = $(BENCH_TESTS)
|
PRETTY_DEPS_pretty-bench = $(BENCH_TESTS)
|
||||||
PRETTY_DEPS_pretty-pretty = $(PRETTY_TESTS)
|
PRETTY_DEPS_pretty-pretty = $(PRETTY_TESTS)
|
||||||
# The stage- and host-specific dependencies are for e.g. macro_crate_test which pulls in
|
|
||||||
# external crates.
|
|
||||||
PRETTY_DEPS$(1)_H_$(3)_pretty-rpass =
|
|
||||||
PRETTY_DEPS$(1)_H_$(3)_pretty-rpass-full = $$(HLIB$(1)_H_$(3))/stamp.syntax $$(HLIB$(1)_H_$(3))/stamp.rustc
|
|
||||||
PRETTY_DEPS$(1)_H_$(3)_pretty-rfail =
|
|
||||||
PRETTY_DEPS$(1)_H_$(3)_pretty-bench =
|
|
||||||
PRETTY_DEPS$(1)_H_$(3)_pretty-pretty =
|
|
||||||
PRETTY_DIRNAME_pretty-rpass = run-pass
|
PRETTY_DIRNAME_pretty-rpass = run-pass
|
||||||
PRETTY_DIRNAME_pretty-rpass-valgrind = run-pass-valgrind
|
PRETTY_DIRNAME_pretty-rpass-valgrind = run-pass-valgrind
|
||||||
PRETTY_DIRNAME_pretty-rpass-full = run-pass-fulldeps
|
PRETTY_DIRNAME_pretty-rpass-full = run-pass-fulldeps
|
||||||
|
@ -767,6 +760,15 @@ PRETTY_DIRNAME_pretty-rfail = run-fail
|
||||||
PRETTY_DIRNAME_pretty-bench = bench
|
PRETTY_DIRNAME_pretty-bench = bench
|
||||||
PRETTY_DIRNAME_pretty-pretty = pretty
|
PRETTY_DIRNAME_pretty-pretty = pretty
|
||||||
|
|
||||||
|
define DEF_PRETTY_FULLDEPS
|
||||||
|
PRETTY_DEPS$(1)_T_$(2)_H_$(3)_pretty-rpass-full = $$(CSREQ$(1)_T_$(3)_H_$(3))
|
||||||
|
endef
|
||||||
|
|
||||||
|
$(foreach host,$(CFG_HOST), \
|
||||||
|
$(foreach target,$(CFG_TARGET), \
|
||||||
|
$(foreach stage,$(STAGES), \
|
||||||
|
$(eval $(call DEF_PRETTY_FULLDEPS,$(stage),$(target),$(host))))))
|
||||||
|
|
||||||
define DEF_RUN_PRETTY_TEST
|
define DEF_RUN_PRETTY_TEST
|
||||||
|
|
||||||
PRETTY_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \
|
PRETTY_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \
|
||||||
|
@ -780,7 +782,7 @@ check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4
|
||||||
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
|
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
|
||||||
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
|
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
|
||||||
$$(PRETTY_DEPS_$(4)) \
|
$$(PRETTY_DEPS_$(4)) \
|
||||||
$$(PRETTY_DEPS$(1)_H_$(3)_$(4))
|
$$(PRETTY_DEPS$(1)_T_$(2)_H_$(3)_$(4))
|
||||||
@$$(call E, run pretty-rpass [$(2)]: $$<)
|
@$$(call E, run pretty-rpass [$(2)]: $$<)
|
||||||
$$(Q)touch $$@.start_time
|
$$(Q)touch $$@.start_time
|
||||||
$$(Q)$$(call CFG_RUN_CTEST_$(2),$(1),$$<,$(3)) \
|
$$(Q)$$(call CFG_RUN_CTEST_$(2),$(1),$$<,$(3)) \
|
||||||
|
|
|
@ -1465,7 +1465,7 @@ fn make_out_name(config: &Config, testfile: &Path, extension: &str) -> PathBuf {
|
||||||
fn aux_output_dir_name(config: &Config, testfile: &Path) -> PathBuf {
|
fn aux_output_dir_name(config: &Config, testfile: &Path) -> PathBuf {
|
||||||
let f = output_base_name(config, testfile);
|
let f = output_base_name(config, testfile);
|
||||||
let mut fname = f.file_name().unwrap().to_os_string();
|
let mut fname = f.file_name().unwrap().to_os_string();
|
||||||
fname.push("libaux");
|
fname.push(&format!(".{}.libaux", config.mode));
|
||||||
f.with_file_name(&fname)
|
f.with_file_name(&fname)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
// aux-build:rlib_crate_test.rs
|
// aux-build:rlib_crate_test.rs
|
||||||
// ignore-stage1
|
// ignore-stage1
|
||||||
// ignore-tidy-linelength
|
// ignore-tidy-linelength
|
||||||
// ignore-android
|
|
||||||
// ignore-cross-compile gives a different error message
|
// ignore-cross-compile gives a different error message
|
||||||
|
|
||||||
#![feature(plugin)]
|
#![feature(plugin)]
|
||||||
|
|
|
@ -27,7 +27,8 @@ define MK_TARGETS
|
||||||
# on some platforms, but LLVM just prints a warning so that's fine for
|
# on some platforms, but LLVM just prints a warning so that's fine for
|
||||||
# now.
|
# now.
|
||||||
$(1): simd.rs
|
$(1): simd.rs
|
||||||
$$(RUSTC) --target=$(1) --emit=llvm-ir,asm simd.rs -C target-feature='+neon,+sse2'
|
$$(RUSTC) --target=$(1) --emit=llvm-ir,asm simd.rs \
|
||||||
|
-C target-feature='+neon,+sse2' -C extra-filename=-$(1)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(foreach targetxxx,$(TARGETS),$(eval $(call MK_TARGETS,$(targetxxx))))
|
$(foreach targetxxx,$(TARGETS),$(eval $(call MK_TARGETS,$(targetxxx))))
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
// Test that the CompilerCalls interface to the compiler works.
|
// Test that the CompilerCalls interface to the compiler works.
|
||||||
|
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
#![feature(rustc_private, path)]
|
#![feature(rustc_private, path)]
|
||||||
#![feature(core)]
|
#![feature(core)]
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
// option. This file may not be copied, modified, or distributed
|
// option. This file may not be copied, modified, or distributed
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
#![feature(rustc_private)]
|
#![feature(rustc_private)]
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// no-prefer-dynamic
|
// no-prefer-dynamic
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
#![feature(rustc_private)]
|
#![feature(rustc_private)]
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// ignore-pretty
|
// ignore-pretty
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
#![feature(quote, rustc_private)]
|
#![feature(quote, rustc_private)]
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
// option. This file may not be copied, modified, or distributed
|
// option. This file may not be copied, modified, or distributed
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
// ignore-pretty: does not work well with `--test`
|
// ignore-pretty: does not work well with `--test`
|
||||||
|
|
||||||
#![feature(quote, rustc_private)]
|
#![feature(quote, rustc_private)]
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
// option. This file may not be copied, modified, or distributed
|
// option. This file may not be copied, modified, or distributed
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
|
// ignore-cross-compile
|
||||||
// ignore-pretty
|
// ignore-pretty
|
||||||
// ignore-test
|
// ignore-test
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
// option. This file may not be copied, modified, or distributed
|
// option. This file may not be copied, modified, or distributed
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
// ignore-pretty: does not work well with `--test`
|
// ignore-pretty: does not work well with `--test`
|
||||||
|
|
||||||
#![feature(quote, rustc_private)]
|
#![feature(quote, rustc_private)]
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
// option. This file may not be copied, modified, or distributed
|
// option. This file may not be copied, modified, or distributed
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
// ignore-pretty: does not work well with `--test`
|
// ignore-pretty: does not work well with `--test`
|
||||||
|
|
||||||
#![feature(quote, rustc_private)]
|
#![feature(quote, rustc_private)]
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
// This test can't be a unit test in std,
|
// This test can't be a unit test in std,
|
||||||
// because it needs TempDir, which is in extra
|
// because it needs TempDir, which is in extra
|
||||||
|
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
#![feature(rustc_private, path_ext)]
|
#![feature(rustc_private, path_ext)]
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:rustdoc-default-impl.rs
|
// aux-build:rustdoc-default-impl.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate rustdoc_default_impl as foo;
|
extern crate rustdoc_default_impl as foo;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:rustdoc-extern-default-method.rs
|
// aux-build:rustdoc-extern-default-method.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate rustdoc_extern_default_method as ext;
|
extern crate rustdoc_extern_default_method as ext;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:rustdoc-extern-method.rs
|
// aux-build:rustdoc-extern-method.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
#![feature(unboxed_closures)]
|
#![feature(unboxed_closures)]
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:rustdoc-ffi.rs
|
// aux-build:rustdoc-ffi.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate rustdoc_ffi as lib;
|
extern crate rustdoc_ffi as lib;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:inline-default-methods.rs
|
// aux-build:inline-default-methods.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate inline_default_methods;
|
extern crate inline_default_methods;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:issue-13698.rs
|
// aux-build:issue-13698.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate issue_13698;
|
extern crate issue_13698;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:issue-15318.rs
|
// aux-build:issue-15318.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate issue_15318;
|
extern crate issue_15318;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:issue-15318.rs
|
// aux-build:issue-15318.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
#![feature(no_std)]
|
#![feature(no_std)]
|
||||||
#![no_std]
|
#![no_std]
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:issue-17476.rs
|
// aux-build:issue-17476.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate issue_17476;
|
extern crate issue_17476;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:issue-19190-3.rs
|
// aux-build:issue-19190-3.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate issue_19190_3;
|
extern crate issue_19190_3;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:issue-20646.rs
|
// aux-build:issue-20646.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
#![feature(associated_types)]
|
#![feature(associated_types)]
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:issue-20727.rs
|
// aux-build:issue-20727.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate issue_20727;
|
extern crate issue_20727;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:issue-20727.rs
|
// aux-build:issue-20727.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate issue_20727;
|
extern crate issue_20727;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:issue-20727.rs
|
// aux-build:issue-20727.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate issue_20727;
|
extern crate issue_20727;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:issue-20727.rs
|
// aux-build:issue-20727.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate issue_20727;
|
extern crate issue_20727;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:issue-21092.rs
|
// aux-build:issue-21092.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate issue_21092;
|
extern crate issue_21092;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:issue-21801.rs
|
// aux-build:issue-21801.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate issue_21801;
|
extern crate issue_21801;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
// aux-build:issue-22025.rs
|
// aux-build:issue-22025.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate issue_22025;
|
extern crate issue_22025;
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
// aux-build:issue-23207-1.rs
|
// aux-build:issue-23207-1.rs
|
||||||
// aux-build:issue-23207-2.rs
|
// aux-build:issue-23207-2.rs
|
||||||
// ignore-android
|
// ignore-cross-compile
|
||||||
|
|
||||||
extern crate issue_23207_2;
|
extern crate issue_23207_2;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue