Merge pull request #3238 from rbtcollins/test-bonanza

Use a single integration test binary

Author: rbtcollins

ci/run.bash

@@ -61,24 +61,17 @@ build_test() {
   cmd="$1"
   shift
   download_pkg_test "${cmd}"
-  target_cargo "${cmd}" --bin rustup-init
-  target_cargo "${cmd}" --lib --all
-  if [ "build" != "${cmd}" ]; then
-    target_cargo "${cmd}" --doc --all
-  fi
-
-  if [ "build" = "${cmd}" ]; then
-    target_cargo "${cmd}" --test dist
+    if [ "build" = "${cmd}" ]; then
+    target_cargo "${cmd}" --workspace --all-targets
   else
     #  free runners have 2 or 3(mac) cores
-    target_cargo "${cmd}" --test dist -- --test-threads 2
+    target_cargo "${cmd}" --workspace --tests -- --test-threads 2
+  fi
+
+  if [ "build" != "${cmd}" ]; then
+    target_cargo "${cmd}" --doc --workspace
   fi
 
-  find tests -maxdepth 1 -type f ! -path '*/dist.rs' -name '*.rs' \
-  | sed -e 's@^tests/@@;s@\.rs$@@g' \
-  | while read -r test; do
-      target_cargo "${cmd}" --test "${test}"
-  done
 }
 
 if [ -z "$SKIP_TESTS" ]; then

tests/mock/clitools.rs

@@ -806,24 +806,6 @@ where
     !(run || self_cmd || version || (is_update && !no_self_update))
 }
 
-#[deprecated]
-pub fn run<I, A>(config: &Config, name: &str, args: I, env: &[(&str, &str)]) -> SanitizedOutput
-where
-    I: IntoIterator<Item = A> + Clone,
-    A: AsRef<OsStr>,
-{
-    config.run(name, args, env)
-}
-
-#[deprecated]
-pub fn run_subprocess<I, A>(config: &Config, name: &str, args: I, env: &[(&str, &str)]) -> Output
-where
-    I: IntoIterator<Item = A>,
-    A: AsRef<OsStr>,
-{
-    config.run_subprocess(name, args, env)
-}
-
 #[derive(Copy, Clone, Eq, PartialEq)]
 enum RlsStatus {
     Available,