feat(test): accept more than one args in for_host*!()

Author: rami3l

src/test.rs

@@ -178,8 +178,8 @@ pub fn this_host_triple() -> String {
 // Format a string with this host triple.
 #[macro_export]
 macro_rules! for_host {
-    ($s: expr) => {
-        &format!($s, $crate::test::this_host_triple())
+    ($s:tt $($arg:tt)*) => {
+        &format!($s, $crate::test::this_host_triple() $($arg)*)
     };
 }
 

tests/suite/cli_rustup.rs

@@ -15,8 +15,8 @@ use rustup::test::{
 use rustup::utils::raw;
 
 macro_rules! for_host_and_home {
-    ($config:expr, $s: expr) => {
-        &format!($s, this_host_triple(), $config.rustupdir)
+    ($config:expr, $s:tt $($arg:tt)*) => {
+        &format!($s, this_host_triple(), $config.rustupdir $($arg)*)
     };
 }