Skip to content

Commit ada635b

Browse files
committed
Allow passing arguments to --scripts
Uses the same option/syntax as the one for cargo, this is also useful for glacier, where we want to use rustc directly rather than cargo
1 parent bf4fe84 commit ada635b

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/main.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ struct Opts {
122122
verbosity: usize,
123123

124124
#[structopt(
125-
help = "Arguments to pass to cargo during tests",
125+
help = "Arguments to pass to cargo or the file specified by --script during tests",
126126
multiple = true,
127127
last = true,
128128
parse(from_os_str)
129129
)]
130-
cargo_args: Vec<OsString>,
130+
command_args: Vec<OsString>,
131131

132132
#[structopt(
133133
long = "start",
@@ -657,15 +657,16 @@ impl Toolchain {
657657
Some(ref script) => {
658658
let mut cmd = Command::new(script);
659659
cmd.env("RUSTUP_TOOLCHAIN", self.rustup_name());
660+
cmd.args(&cfg.args.command_args);
660661
cmd
661662
}
662663
None => {
663664
let mut cmd = Command::new("cargo");
664665
cmd.arg(&format!("+{}", self.rustup_name()));
665-
if cfg.args.cargo_args.is_empty() {
666+
if cfg.args.command_args.is_empty() {
666667
cmd.arg("build");
667668
} else {
668-
cmd.args(&cfg.args.cargo_args);
669+
cmd.args(&cfg.args.command_args);
669670
}
670671
cmd
671672
}

0 commit comments

Comments
 (0)