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.

Author: alexcrichton

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 <alex@alexcrichton.com>"]
+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 renamed to 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 renamed to 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 renamed to 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 renamed to 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 renamed to 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! {