Extract support directory to its own crate

Extract out all our test support code to its own standalone crate so it
can be shared between multiple test suites if necessary.

Cargo.toml

@@ -103,6 +103,7 @@ features = [
 
 [dev-dependencies]
 cargo-test-macro = { path = "crates/cargo-test-macro", version = "0.1.0" }
+cargo-test-support = { path = "crates/cargo-test-support", version = "0.1.0" }
 
 [[bin]]
 name = "cargo"

azure-pipelines.yml

@@ -54,6 +54,8 @@ jobs:
       displayName: "Check rustfmt (cargo)"
     - bash: cd crates/cargo-test-macro && cargo fmt --all -- --check
       displayName: "Check rustfmt (cargo-test-macro)"
+    - bash: cd crates/cargo-test-support && cargo fmt --all -- --check
+      displayName: "Check rustfmt (cargo-test-support)"
     - bash: cd crates/crates-io && cargo fmt --all -- --check
       displayName: "Check rustfmt (crates-io)"
     - bash: cd crates/resolver-tests && cargo fmt --all -- --check

ci/azure-test-all.yml

@@ -31,3 +31,6 @@ steps:
 # fix the link errors.
 - bash: cargo test --features 'deny-warnings curl/force-system-lib-on-osx'
   displayName: "cargo test"
+
+- bash: cargo test -p cargo-test-support
+  displayName: "cargo test -p cargo-test-support"

crates/cargo-test-macro/src/lib.rs

@@ -33,10 +33,7 @@ pub fn cargo_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
             TokenTree::from(Ident::new("let", span)),
             TokenTree::from(Ident::new("_test_guard", span)),
             TokenTree::from(Punct::new('=', Spacing::Alone)),
-            TokenTree::from(Ident::new("crate", span)),
-            TokenTree::from(Punct::new(':', Spacing::Joint)),
-            TokenTree::from(Punct::new(':', Spacing::Alone)),
-            TokenTree::from(Ident::new("support", span)),
+            TokenTree::from(Ident::new("cargo_test_support", span)),
             TokenTree::from(Punct::new(':', Spacing::Joint)),
             TokenTree::from(Punct::new(':', Spacing::Alone)),
             TokenTree::from(Ident::new("paths", span)),

crates/cargo-test-support/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "cargo-test-support"
+version = "0.1.0"
+authors = ["Alex Crichton <[email protected]>"]
+edition = "2018"
+
+[dependencies]
+cargo = { path = "../.." }
+filetime = "0.2"
+flate2 = "1.0"
+git2 = "0.10"
+glob = "0.3"
+lazy_static = "1.0"
+remove_dir_all = "0.5"
+serde_json = "1.0"
+tar = "0.4"
+url = "2.0"

tests/testsuite/support/cross_compile.rs → crates/cargo-test-support/src/cross_compile.rs

@@ -1,10 +1,9 @@
+use crate::{basic_bin_manifest, main_file, project};
 use std::env;
 use std::process::Command;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Once;
 
-use crate::support::{basic_bin_manifest, main_file, project};
-
 pub fn disabled() -> bool {
     // First, disable if `./configure` requested so.
     match env::var("CFG_DISABLE_CROSS_TESTS") {

tests/testsuite/support/git.rs → crates/cargo-test-support/src/git.rs

@@ -38,15 +38,13 @@ use some of the helper functions in this file to interact with the repository.
 
 */
 
+use crate::{path2url, project, Project, ProjectBuilder};
+use git2;
 use std::fs::{self, File};
 use std::io::prelude::*;
 use std::path::{Path, PathBuf};
-
-use git2;
 use url::Url;
 
-use crate::support::{path2url, project, Project, ProjectBuilder};
-
 #[must_use]
 pub struct RepoBuilder {
     repo: git2::Repository,

tests/testsuite/support/install.rs → crates/cargo-test-support/src/install.rs

@@ -1,8 +1,7 @@
+use crate::paths;
 use std::env::consts::EXE_SUFFIX;
 use std::path::{Path, PathBuf};
 
-use crate::support::paths;
-
 /// Used by `cargo install` tests to assert an executable binary
 /// has been installed. Example usage:
 ///

tests/testsuite/support/mod.rs → crates/cargo-test-support/src/lib.rs

@@ -125,6 +125,7 @@ use url::Url;
 
 use self::paths::CargoPathExt;
 
+#[macro_export]
 macro_rules! t {
     ($e:expr) => {
         match $e {
@@ -409,7 +410,7 @@ impl Project {
     ///             .with_stdout("bar\n")
     ///             .run();
     pub fn process<T: AsRef<OsStr>>(&self, program: T) -> Execs {
-        let mut p = crate::support::process(program);
+        let mut p = process(program);
         p.cwd(self.root());
         execs().with_process_builder(p)
     }
@@ -1425,7 +1426,7 @@ pub fn lines_match(expected: &str, mut actual: &str) -> bool {
     actual.is_empty() || expected.ends_with("[..]")
 }
 
-#[cargo_test]
+#[test]
 fn lines_match_works() {
     assert!(lines_match("a b", "a b"));
     assert!(lines_match("a[..]b", "a b"));

tests/testsuite/support/paths.rs → crates/cargo-test-support/src/paths.rs

@@ -1,3 +1,5 @@
+use filetime::{self, FileTime};
+use lazy_static::lazy_static;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::env;
@@ -7,9 +9,6 @@ use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Mutex;
 
-use filetime::{self, FileTime};
-use lazy_static::lazy_static;
-
 static CARGO_INTEGRATION_TEST_DIR: &str = "cit";
 
 lazy_static! {

tests/testsuite/support/publish.rs → crates/cargo-test-support/src/publish.rs

@@ -1,12 +1,10 @@
+use crate::registry::{self, alt_api_path};
+use crate::{find_json_mismatch, lines_match};
+use flate2::read::GzDecoder;
 use std::collections::{HashMap, HashSet};
 use std::fs::File;
 use std::io::{self, prelude::*, SeekFrom};
 use std::path::{Path, PathBuf};
-
-use crate::support::registry::{self, alt_api_path};
-use crate::support::{find_json_mismatch, lines_match};
-
-use flate2::read::GzDecoder;
 use tar::Archive;
 
 fn read_le_u32<R>(mut reader: R) -> io::Result<u32>

tests/testsuite/support/registry.rs → crates/cargo-test-support/src/registry.rs

@@ -1,18 +1,16 @@
-use std::collections::HashMap;
-use std::fs::{self, File};
-use std::io::prelude::*;
-use std::path::{Path, PathBuf};
-
+use crate::git::repo;
+use crate::paths;
 use cargo::sources::CRATES_IO_INDEX;
 use cargo::util::Sha256;
 use flate2::write::GzEncoder;
 use flate2::Compression;
+use std::collections::HashMap;
+use std::fs::{self, File};
+use std::io::prelude::*;
+use std::path::{Path, PathBuf};
 use tar::{Builder, Header};
 use url::Url;
 
-use crate::support::git::repo;
-use crate::support::paths;
-
 /// Gets the path to the local index pretending to be crates.io. This is a Git repo
 /// initialized with a `config.json` file pointing to `dl_path` for downloads
 /// and `api_path` for uploads.

tests/testsuite/alt_registry.rs

@@ -1,6 +1,6 @@
-use crate::support::publish::validate_alt_upload;
-use crate::support::registry::{self, Package};
-use crate::support::{basic_manifest, git, paths, project};
+use cargo_test_support::publish::validate_alt_upload;
+use cargo_test_support::registry::{self, Package};
+use cargo_test_support::{basic_manifest, git, paths, project};
 use cargo::util::IntoUrl;
 use std::fs::{self, File};
 use std::io::Write;

tests/testsuite/bad_config.rs

@@ -1,5 +1,5 @@
-use crate::support::registry::Package;
-use crate::support::{basic_manifest, project};
+use cargo_test_support::registry::Package;
+use cargo_test_support::{basic_manifest, project};
 
 #[cargo_test]
 fn bad1() {

tests/testsuite/bad_manifest_path.rs

@@ -1,4 +1,4 @@
-use crate::support::{basic_bin_manifest, main_file, project};
+use cargo_test_support::{basic_bin_manifest, main_file, project};
 
 fn assert_not_a_cargo_toml(command: &str, manifest_path_argument: &str) {
     let p = project()

tests/testsuite/bench.rs

@@ -1,6 +1,6 @@
-use crate::support::is_nightly;
-use crate::support::paths::CargoPathExt;
-use crate::support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, project};
+use cargo_test_support::is_nightly;
+use cargo_test_support::paths::CargoPathExt;
+use cargo_test_support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, project};
 
 #[cargo_test]
 fn cargo_bench_simple() {

tests/testsuite/build.rs

@@ -1,12 +1,11 @@
 use std::env;
 use std::fs::{self, File};
 use std::io::prelude::*;
-
-use crate::support::paths::{root, CargoPathExt};
-use crate::support::registry::Package;
-use crate::support::{
+use cargo_test_support::paths::{root, CargoPathExt};
+use cargo_test_support::registry::Package;
+use cargo_test_support::{
     basic_bin_manifest, basic_lib_manifest, basic_manifest, main_file, project, rustc_host,
-    sleep_ms, symlink_supported, Execs, ProjectBuilder,
+    sleep_ms, symlink_supported, Execs, ProjectBuilder, t,
 };
 use cargo::util::paths::dylib_path_envvar;
 
@@ -4541,7 +4540,7 @@ Caused by:
 
 #[cargo_test]
 fn tricky_pipelining() {
-    if !crate::support::is_nightly() {
+    if !cargo_test_support::is_nightly() {
         return;
     }
 
@@ -4571,7 +4570,7 @@ fn tricky_pipelining() {
 
 #[cargo_test]
 fn pipelining_works() {
-    if !crate::support::is_nightly() {
+    if !cargo_test_support::is_nightly() {
         return;
     }
 
@@ -4606,7 +4605,7 @@ fn pipelining_works() {
 
 #[cargo_test]
 fn pipelining_big_graph() {
-    if !crate::support::is_nightly() {
+    if !cargo_test_support::is_nightly() {
         return;
     }
 

tests/testsuite/build_auth.rs

@@ -6,8 +6,8 @@ use std::sync::atomic::{AtomicUsize, Ordering::SeqCst};
 use std::sync::Arc;
 use std::thread;
 
-use crate::support::paths;
-use crate::support::{basic_manifest, project};
+use cargo_test_support::paths;
+use cargo_test_support::{basic_manifest, project};
 use git2;
 
 // Tests that HTTP auth is offered from `credential.helper`.

tests/testsuite/build_lib.rs

@@ -1,4 +1,4 @@
-use crate::support::{basic_bin_manifest, basic_manifest, project};
+use cargo_test_support::{basic_bin_manifest, basic_manifest, project};
 
 #[cargo_test]
 fn build_lib_only() {

tests/testsuite/build_plan.rs

@@ -1,5 +1,5 @@
-use crate::support::registry::Package;
-use crate::support::{basic_bin_manifest, basic_manifest, main_file, project};
+use cargo_test_support::registry::Package;
+use cargo_test_support::{basic_bin_manifest, basic_manifest, main_file, project};
 
 #[cargo_test]
 fn cargo_build_plan_simple() {

tests/testsuite/build_script.rs

@@ -4,10 +4,10 @@ use std::io;
 use std::io::prelude::*;
 use std::thread;
 
-use crate::support::paths::CargoPathExt;
-use crate::support::registry::Package;
-use crate::support::{basic_manifest, cross_compile, project};
-use crate::support::{rustc_host, sleep_ms, slow_cpu_multiplier};
+use cargo_test_support::paths::CargoPathExt;
+use cargo_test_support::registry::Package;
+use cargo_test_support::{basic_manifest, cross_compile, project};
+use cargo_test_support::{rustc_host, sleep_ms, slow_cpu_multiplier};
 use cargo::util::paths::remove_dir_all;
 
 #[cargo_test]
@@ -2277,7 +2277,7 @@ fn flags_go_into_tests() {
 #[cargo_test]
 fn diamond_passes_args_only_once() {
     // FIXME: when pipelining rides to stable, enable this test on all channels.
-    if !crate::support::is_nightly() {
+    if !cargo_test_support::is_nightly() {
         return;
     }
 

tests/testsuite/build_script_env.rs

@@ -1,7 +1,7 @@
 use std::fs::File;
 
-use crate::support::project;
-use crate::support::sleep_ms;
+use cargo_test_support::project;
+use cargo_test_support::sleep_ms;
 
 #[cargo_test]
 fn rerun_if_env_changes() {

tests/testsuite/cache_messages.rs

@@ -1,4 +1,4 @@
-use crate::support::{clippy_is_available, is_nightly, process, project, registry::Package};
+use cargo_test_support::{clippy_is_available, is_nightly, process, project, registry::Package};
 use std::path::Path;
 
 fn as_str(bytes: &[u8]) -> &str {

tests/testsuite/cargo_alias_config.rs

@@ -1,4 +1,4 @@
-use crate::support::{basic_bin_manifest, project};
+use cargo_test_support::{basic_bin_manifest, project};
 
 #[cargo_test]
 fn alias_incorrect_config_type() {

tests/testsuite/cargo_command.rs

@@ -4,10 +4,10 @@ use std::io::prelude::*;
 use std::path::{Path, PathBuf};
 use std::str;
 
-use crate::support::cargo_process;
-use crate::support::paths::{self, CargoPathExt};
-use crate::support::registry::Package;
-use crate::support::{basic_bin_manifest, basic_manifest, cargo_exe, project, Project};
+use cargo_test_support::cargo_process;
+use cargo_test_support::paths::{self, CargoPathExt};
+use cargo_test_support::registry::Package;
+use cargo_test_support::{basic_bin_manifest, basic_manifest, cargo_exe, project, Project};
 use cargo;
 
 #[cfg_attr(windows, allow(dead_code))]

tests/testsuite/cargo_features.rs

@@ -1,4 +1,4 @@
-use crate::support::{project, registry};
+use cargo_test_support::{project, registry};
 
 #[cargo_test]
 fn feature_required() {

tests/testsuite/cfg.rs

@@ -1,9 +1,9 @@
 use std::fmt;
 use std::str::FromStr;
 
-use crate::support::registry::Package;
-use crate::support::rustc_host;
-use crate::support::{basic_manifest, project};
+use cargo_test_support::registry::Package;
+use cargo_test_support::rustc_host;
+use cargo_test_support::{basic_manifest, project};
 use cargo::util::{Cfg, CfgExpr};
 
 macro_rules! c {

tests/testsuite/check.rs

@@ -1,9 +1,9 @@
 use std::fmt::{self, Write};
 
-use crate::support::install::exe;
-use crate::support::paths::CargoPathExt;
-use crate::support::registry::Package;
-use crate::support::{basic_manifest, project};
+use cargo_test_support::install::exe;
+use cargo_test_support::paths::CargoPathExt;
+use cargo_test_support::registry::Package;
+use cargo_test_support::{basic_manifest, project};
 
 #[cargo_test]
 fn check_success() {

tests/testsuite/clean.rs

@@ -1,7 +1,7 @@
 use std::env;
 
-use crate::support::registry::Package;
-use crate::support::{basic_bin_manifest, basic_manifest, git, main_file, project};
+use cargo_test_support::registry::Package;
+use cargo_test_support::{basic_bin_manifest, basic_manifest, git, main_file, project};
 
 #[cargo_test]
 fn cargo_clean_simple() {

tests/testsuite/clippy.rs

@@ -1,4 +1,4 @@
-use crate::support::{clippy_is_available, project, registry::Package};
+use cargo_test_support::{clippy_is_available, project, registry::Package};
 
 #[cargo_test]
 // Clippy should never be considered fresh.

tests/testsuite/collisions.rs

@@ -1,4 +1,4 @@
-use crate::support::{basic_manifest, project};
+use cargo_test_support::{basic_manifest, project};
 use std::env;
 
 #[cargo_test]