Auto merge of #5063 - Eh2406:TestssuiteV3, r=matklad

Reorganize integration tests as one crate with many modules. Issue #4867. Rebased V3

This is an automatic rebase of @rochamatcomp's work in #5022, as requested in [#5038](#5038 (comment)).

I take no credit for the changes; I just wanted faster test for my work. :-)

Author: bors

Cargo.toml

@@ -80,11 +80,15 @@ features = [
 
 [dev-dependencies]
 bufstream = "0.1"
-cargotest = { path = "tests/cargotest", version = "0.1" }
+cargotest = { path = "tests/testsuite/cargotest", version = "0.1" }
 filetime = "0.1"
 hamcrest = "=0.1.1"
 
 [[bin]]
 name = "cargo"
 test = false
 doc = false
+
+[[test]]
+name = "testsuite"
+path = "tests/testsuite/lib.rs"

tests/alt-registry.rs renamed to tests/testsuite/alt_registry.rs

@@ -1,6 +1,3 @@
-extern crate cargotest;
-extern crate hamcrest;
-
 use cargotest::ChannelChanger;
 use cargotest::support::registry::{self, Package, alt_api_path};
 use cargotest::support::{paths, project, execs};

tests/bad-config.rs renamed to tests/testsuite/bad_config.rs

@@ -1,6 +1,3 @@
-extern crate cargotest;
-extern crate hamcrest;
-
 use cargotest::support::{project, execs};
 use cargotest::support::registry::Package;
 use hamcrest::assert_that;

tests/bad-manifest-path.rs renamed to tests/testsuite/bad_manifest_path.rs

@@ -1,6 +1,3 @@
-extern crate hamcrest;
-extern crate cargotest;
-
 use cargotest::support::{project, execs, main_file, basic_bin_manifest};
 use hamcrest::{assert_that};
 

tests/bench.rs renamed to tests/testsuite/bench.rs

@@ -1,7 +1,3 @@
-extern crate cargotest;
-extern crate cargo;
-extern crate hamcrest;
-
 use std::str;
 
 use cargo::util::process;

tests/build.rs renamed to tests/testsuite/build.rs

@@ -1,9 +1,3 @@
-extern crate cargo;
-#[macro_use]
-extern crate cargotest;
-extern crate hamcrest;
-extern crate tempdir;
-
 use std::env;
 use std::fs::{self, File};
 use std::io::prelude::*;

tests/build-auth.rs renamed to tests/testsuite/build_auth.rs

@@ -1,13 +1,10 @@
-extern crate bufstream;
-extern crate git2;
-extern crate cargotest;
-extern crate hamcrest;
-
+use std;
 use std::collections::HashSet;
 use std::io::prelude::*;
 use std::net::TcpListener;
 use std::thread;
 
+use git2;
 use bufstream::BufStream;
 use cargotest::support::paths;
 use cargotest::support::{project, execs};

tests/build-lib.rs renamed to tests/testsuite/build_lib.rs

@@ -1,6 +1,3 @@
-extern crate cargotest;
-extern crate hamcrest;
-
 use std::env;
 use std::fs::{self, File};
 use std::io::prelude::*;

tests/build-script.rs renamed to tests/testsuite/build_script.rs

@@ -1,6 +1,3 @@
-extern crate cargotest;
-extern crate hamcrest;
-
 use std::fs::File;
 
 use cargotest::sleep_ms;

tests/build-script-env.rs renamed to tests/testsuite/build_script_env.rs

@@ -1,5 +1,3 @@
-extern crate cargotest;
-extern crate hamcrest;
 use cargotest::support::{project, execs, basic_bin_manifest};
 use hamcrest::{assert_that};
 

tests/cargo_alias_config.rs renamed to tests/testsuite/cargo_alias_config.rs

@@ -1,13 +1,10 @@
-extern crate cargo;
-extern crate cargotest;
-extern crate hamcrest;
-
 use std::env;
 use std::fs::{self, File};
 use std::io::prelude::*;
 use std::path::{Path, PathBuf};
 use std::str;
 
+use cargo;
 use cargotest::cargo_process;
 use cargotest::support::paths::{self, CargoPathExt};
 use cargotest::support::{execs, project, Project, basic_bin_manifest};

tests/cargo.rs renamed to tests/testsuite/cargo_command.rs

@@ -1,6 +1,3 @@
-extern crate cargotest;
-extern crate hamcrest;
-
 use cargotest::ChannelChanger;
 use cargotest::support::{project, execs};
 use hamcrest::assert_that;

tests/cargo-features.rs renamed to tests/testsuite/cargo_features.rs

@@ -7,7 +7,7 @@ authors = ["Alex Crichton <[email protected]>"]
 path = "lib.rs"
 
 [dependencies]
-cargo = { path = "../.." }
+cargo = { path = "../../.." }
 filetime = "0.1"
 flate2 = "1.0"
 git2 = { version = "0.6", default-features = false }

tests/cargotest/Cargo.toml renamed to tests/testsuite/cargotest/Cargo.toml

@@ -1,7 +1,3 @@
-extern crate cargo;
-extern crate cargotest;
-extern crate hamcrest;
-
 use std::str::FromStr;
 use std::fmt;
 

tests/cargotest/install.rs renamed to tests/testsuite/cargotest/install.rs

@@ -1,7 +1,3 @@
-extern crate cargotest;
-extern crate hamcrest;
-extern crate glob;
-
 use cargotest::is_nightly;
 use cargotest::support::{execs, project};
 use cargotest::support::registry::Package;

tests/cargotest/lib.rs renamed to tests/testsuite/cargotest/lib.rs

@@ -1,6 +1,3 @@
-extern crate hamcrest;
-extern crate cargotest;
-
 use std::env;
 
 use cargotest::support::{git, project, execs, main_file, basic_bin_manifest};

tests/cargotest/support/cross_compile.rs renamed to tests/testsuite/cargotest/support/cross_compile.rs

@@ -1,7 +1,3 @@
-extern crate cargotest;
-extern crate git2;
-extern crate hamcrest;
-
 use std::{env, str};
 use std::fs::{self, File};
 use std::io::Write;
@@ -11,6 +7,8 @@ use std::thread;
 use std::sync::mpsc::channel;
 use std::time::Duration;
 
+use git2;
+use cargotest;
 use cargotest::install::{has_installed_exe, cargo_home};
 use cargotest::support::git;
 use cargotest::support::registry::Package;

tests/cargotest/support/git.rs renamed to tests/testsuite/cargotest/support/git.rs

@@ -1,6 +1,3 @@
-extern crate hamcrest;
-extern crate cargotest;
-
 use cargotest::support::{project, execs};
 use hamcrest::assert_that;
 

tests/cargotest/support/mod.rs renamed to tests/testsuite/cargotest/support/mod.rs

@@ -1,7 +1,3 @@
-extern crate cargo;
-extern crate cargotest;
-extern crate hamcrest;
-
 use cargo::util::process;
 use cargotest::{is_nightly, rustc_host};
 use cargotest::support::{project, execs, basic_bin_manifest, cross_compile};

tests/cargotest/support/paths.rs renamed to tests/testsuite/cargotest/support/paths.rs

@@ -1,9 +1,3 @@
-extern crate cargo;
-extern crate cargotest;
-extern crate hamcrest;
-extern crate flate2;
-extern crate tar;
-
 use std::fs::File;
 use std::path::PathBuf;
 use std::io::prelude::*;

tests/cargotest/support/publish.rs renamed to tests/testsuite/cargotest/support/publish.rs

@@ -1,8 +1,3 @@
-extern crate cargotest;
-extern crate libc;
-#[cfg(windows)]
-extern crate winapi;
-
 use std::fs;
 use std::io::{self, Read};
 use std::net::TcpListener;
@@ -33,8 +28,8 @@ fn enabled() -> bool {
         let me = processthreadsapi::GetCurrentProcess();
         let mut ret = 0;
         let r = jobapi::IsProcessInJob(me, 0 as *mut _, &mut ret);
-        assert!(r != 0);
-        if ret == winapi::shared::minwindef::FALSE {
+        assert_ne!(r, 0);
+        if ret == ::winapi::shared::minwindef::FALSE {
             return true
         }
 

tests/cargotest/support/registry.rs renamed to tests/testsuite/cargotest/support/registry.rs

@@ -1,6 +1,3 @@
-extern crate cargotest;
-extern crate hamcrest;
-
 use cargotest::support::{basic_bin_manifest, main_file, execs, project};
 use hamcrest::{assert_that, existing_file};
 

tests/cfg.rs renamed to tests/testsuite/cfg.rs

@@ -1,10 +1,4 @@
-#[macro_use]
-extern crate cargotest;
-extern crate hamcrest;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-
+use serde_json;
 use std::collections::HashMap;
 use std::fs::{self, File};
 use std::io::prelude::*;

tests/check-style.sh renamed to tests/testsuite/check-style.sh

@@ -1,7 +1,4 @@
-extern crate cargotest;
-extern crate hamcrest;
-extern crate cargo;
-
+use cargotest;
 use std::str;
 use std::fs::{self, File};
 use std::io::Read;

tests/check.rs renamed to tests/testsuite/check.rs

@@ -1,7 +1,3 @@
-#[macro_use]
-extern crate cargotest;
-extern crate hamcrest;
-
 use std::fs::File;
 use std::io::prelude::*;
 

tests/clean.rs renamed to tests/testsuite/clean.rs

@@ -1,6 +1,3 @@
-extern crate cargotest;
-extern crate hamcrest;
-
 use cargotest::support::{project, execs};
 use hamcrest::assert_that;
 

tests/concurrent.rs renamed to tests/testsuite/concurrent.rs

@@ -1,6 +1,3 @@
-extern crate cargotest;
-extern crate hamcrest;
-
 use std::fs::{self, File};
 use std::io::prelude::*;
 

tests/config.rs renamed to tests/testsuite/config.rs

@@ -1,6 +1,3 @@
-extern crate cargotest;
-extern crate hamcrest;
-
 use std::fs::{self, File};
 use std::io::prelude::*;
 

tests/cross-compile.rs renamed to tests/testsuite/cross_compile.rs

@@ -1,8 +1,4 @@
-extern crate cargo;
-extern crate cargotest;
-extern crate git2;
-extern crate hamcrest;
-
+use git2;
 use std::fs::{self, File};
 use std::io::prelude::*;
 use std::net::{TcpListener, TcpStream};

tests/cross-publish.rs renamed to tests/testsuite/cross_publish.rs

@@ -1,8 +1,4 @@
-extern crate cargotest;
-extern crate cargo;
-extern crate tempdir;
-extern crate hamcrest;
-
+use cargotest;
 use std::fs::{self, File};
 use std::io::prelude::*;
 use std::env;

tests/death.rs renamed to tests/testsuite/death.rs

@@ -1,7 +1,4 @@
-extern crate cargo;
-extern crate cargotest;
-extern crate hamcrest;
-
+use cargotest;
 use std::fs::{self, File, OpenOptions};
 use std::io::prelude::*;
 

tests/dep-info.rs renamed to tests/testsuite/dep_info.rs

@@ -1,6 +1,3 @@
-extern crate cargotest;
-extern crate hamcrest;
-
 use std::net::TcpListener;
 use std::thread;
 use std::process::Command;

tests/directory.rs renamed to tests/testsuite/directory.rs

@@ -0,0 +1,82 @@
+extern crate cargo;
+#[macro_use]
+extern crate cargotest;
+extern crate hamcrest;
+extern crate tempdir;
+extern crate bufstream;
+extern crate git2;
+extern crate glob;
+extern crate flate2;
+extern crate tar;
+extern crate libc;
+#[cfg(windows)]
+extern crate winapi;
+#[macro_use]
+extern crate serde_derive;
+extern crate serde_json;
+extern crate toml;
+extern crate url;
+
+
+mod alt_registry;
+mod bad_config;
+mod bad_manifest_path;
+mod bench;
+mod build_auth;
+mod build_lib;
+mod build;
+mod build_script_env;
+mod build_script;
+mod cargo_alias_config;
+mod cargo_features;
+mod cargo_command;
+mod cfg;
+mod check;
+mod clean;
+mod concurrent;
+mod config;
+mod cross_compile;
+mod cross_publish;
+mod death;
+mod dep_info;
+mod directory;
+mod doc;
+mod features;
+mod fetch;
+mod freshness;
+mod generate_lockfile;
+mod git;
+mod init;
+mod install;
+mod jobserver;
+mod local_registry;
+mod lockfile_compat;
+mod login;
+mod metadata;
+mod net_config;
+mod new;
+mod overrides;
+mod package;
+mod patch;
+mod path;
+mod plugins;
+mod proc_macro;
+mod profiles;
+mod publish;
+mod read_manifest;
+mod registry;
+mod required_features;
+mod resolve;
+mod run;
+mod rustc;
+mod rustdocflags;
+mod rustdoc;
+mod rustflags;
+mod search;
+mod small_fd_limits;
+mod test;
+mod tool_paths;
+mod verify_project;
+mod version;
+mod warn_on_failure;
+mod workspaces;

tests/doc.rs renamed to tests/testsuite/doc.rs

@@ -1,7 +1,3 @@
-#[macro_use]
-extern crate cargotest;
-extern crate hamcrest;
-
 use std::fs::{self, File};
 use std::io::prelude::*;
 

tests/features.rs renamed to tests/testsuite/features.rs

@@ -1,6 +1,3 @@
-extern crate cargotest;
-extern crate hamcrest;
-
 use cargotest::support::git;
 use cargotest::support::registry::Package;
 use cargotest::support::{execs, project, lines_match};