Use conventions to specify the integration tests

diff --git a/Cargo.toml b/Cargo.toml
index 3aca13b3cd83a9752beb5e5c016cb1a2df096129..70085644bd1a9876db2c52125ab99d7ce496c726 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -86,7 +86,3 @@ bufstream = "0.1"
 name = "cargo"
 test = false
 doc = false
-
-[[test]]
-name = "testsuite"
-path = "tests/testsuite/lib.rs"

diff --git a/tests/testsuite/lib.rs b/tests/testsuite/lib.rs
deleted file mode 100644 (file)
index 9f66a61..0000000
--- a/tests/testsuite/lib.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-extern crate bufstream;
-extern crate cargo;
-extern crate filetime;
-extern crate flate2;
-extern crate git2;
-extern crate glob;
-extern crate hex;
-extern crate libc;
-#[macro_use]
-extern crate serde_derive;
-#[macro_use]
-extern crate serde_json;
-extern crate tar;
-extern crate tempdir;
-extern crate toml;
-extern crate url;
-#[cfg(windows)]
-extern crate winapi;
-
-#[macro_use]
-mod cargotest;
-mod hamcrest;
-
-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 corrupt_git;
-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 rename_deps;
-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;

diff --git a/tests/testsuite/main.rs b/tests/testsuite/main.rs
new file mode 100644 (file)
index 0000000..9f66a61
--- /dev/null
+++ b/tests/testsuite/main.rs
@@ -0,0 +1,87 @@
+extern crate bufstream;
+extern crate cargo;
+extern crate filetime;
+extern crate flate2;
+extern crate git2;
+extern crate glob;
+extern crate hex;
+extern crate libc;
+#[macro_use]
+extern crate serde_derive;
+#[macro_use]
+extern crate serde_json;
+extern crate tar;
+extern crate tempdir;
+extern crate toml;
+extern crate url;
+#[cfg(windows)]
+extern crate winapi;
+
+#[macro_use]
+mod cargotest;
+mod hamcrest;
+
+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 corrupt_git;
+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 rename_deps;
+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;