about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-04-18 17:53:58 -0700
committerbors <bors@rust-lang.org>2016-04-18 17:53:58 -0700
commitd36ad55aa5176eeec0da6d2a7b1689c263195e8a (patch)
treeb905f307184a974fb3f31f7c239e6e7cb5fa30a8 /src/test
parentb324fa7204dbdc17544d4402ffd0b1964df326f7 (diff)
parentb325baf0ae838c16eb554185bb8653189561dbc8 (diff)
downloadrust-d36ad55aa5176eeec0da6d2a7b1689c263195e8a.tar.gz
rust-d36ad55aa5176eeec0da6d2a7b1689c263195e8a.zip
Auto merge of #32755 - alexcrichton:rustbuild-start-test, r=brson
rustbuild: Add support for compiletest test suites

This commit adds support in rustbuild for running all of the compiletest test
suites as part of `make check`. The `compiletest` program was moved to
`src/tools` (like `rustbook` and others) and is now just compiled like any other
old tool. Each test suite has a pretty standard set of dependencies and just
tweaks various parameters to the final compiletest executable.

Note that full support is lacking in terms of:

* Once a test suite has passed, that's not remembered. When a test suite is
  requested to be run, it's always run.
* The arguments to compiletest probably don't work for every possible
  combination of platforms and testing environments just yet. There will likely
  need to be future updates to tweak various pieces here and there.
* Cross compiled test suites probably don't work just yet, support for that will
  come in a follow-up patch.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/auxiliary/rbmtp_cross_crate_lib.rs (renamed from src/test/auxiliary/regions_bounded_method_type_parameters_cross_crate_lib.rs)0
-rw-r--r--src/test/auxiliary/tdticc_coherence_lib.rs (renamed from src/test/auxiliary/typeck_default_trait_impl_cross_crate_coherence_lib.rs)0
-rw-r--r--src/test/compile-fail/regions-bounded-method-type-parameters-cross-crate.rs4
-rw-r--r--src/test/compile-fail/typeck-default-trait-impl-cross-crate-coherence.rs4
4 files changed, 4 insertions, 4 deletions
diff --git a/src/test/auxiliary/regions_bounded_method_type_parameters_cross_crate_lib.rs b/src/test/auxiliary/rbmtp_cross_crate_lib.rs
index f49ac4fc8e4..f49ac4fc8e4 100644
--- a/src/test/auxiliary/regions_bounded_method_type_parameters_cross_crate_lib.rs
+++ b/src/test/auxiliary/rbmtp_cross_crate_lib.rs
diff --git a/src/test/auxiliary/typeck_default_trait_impl_cross_crate_coherence_lib.rs b/src/test/auxiliary/tdticc_coherence_lib.rs
index 2e425ac96c5..2e425ac96c5 100644
--- a/src/test/auxiliary/typeck_default_trait_impl_cross_crate_coherence_lib.rs
+++ b/src/test/auxiliary/tdticc_coherence_lib.rs
diff --git a/src/test/compile-fail/regions-bounded-method-type-parameters-cross-crate.rs b/src/test/compile-fail/regions-bounded-method-type-parameters-cross-crate.rs
index 82d05c5d716..1eb36e34ab3 100644
--- a/src/test/compile-fail/regions-bounded-method-type-parameters-cross-crate.rs
+++ b/src/test/compile-fail/regions-bounded-method-type-parameters-cross-crate.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:regions_bounded_method_type_parameters_cross_crate_lib.rs
+// aux-build:rbmtp_cross_crate_lib.rs
 
 // Check explicit region bounds on methods in the cross crate case.
 
-extern crate regions_bounded_method_type_parameters_cross_crate_lib as lib;
+extern crate rbmtp_cross_crate_lib as lib;
 
 use lib::Inv;
 use lib::MaybeOwned;
diff --git a/src/test/compile-fail/typeck-default-trait-impl-cross-crate-coherence.rs b/src/test/compile-fail/typeck-default-trait-impl-cross-crate-coherence.rs
index b1febae7680..b918b0dde47 100644
--- a/src/test/compile-fail/typeck-default-trait-impl-cross-crate-coherence.rs
+++ b/src/test/compile-fail/typeck-default-trait-impl-cross-crate-coherence.rs
@@ -8,14 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:typeck_default_trait_impl_cross_crate_coherence_lib.rs
+// aux-build:tdticc_coherence_lib.rs
 
 // Test that we do not consider associated types to be sendable without
 // some applicable trait bound (and we don't ICE).
 
 #![feature(optin_builtin_traits)]
 
-extern crate typeck_default_trait_impl_cross_crate_coherence_lib as lib;
+extern crate tdticc_coherence_lib as lib;
 
 use lib::DefaultedTrait;