Skip to content

Commit 2dcfdd2

Browse files
committed
Split *_ARGS values using shell-like syntax.
1 parent c35cc93 commit 2dcfdd2

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

crates/cli/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ rouille = { version = "3.0.0", default-features = false }
3030
serde = { version = "1.0", features = ['derive'] }
3131
serde_derive = "1.0"
3232
serde_json = "1.0"
33+
shlex = "1.3.0"
3334
tempfile = "3.0"
3435
ureq = { version = "2.7", default-features = false, features = ["brotli", "gzip"] }
3536
walrus = "0.23"

crates/cli/src/bin/wasm-bindgen-test-runner/headless.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,13 @@ impl Driver {
251251
/// extra arguments to the driver's invocation.
252252
fn find() -> Result<Driver, Error> {
253253
let env_args = |name: &str| {
254-
env::var(format!("{}_ARGS", name.to_uppercase()))
255-
.unwrap_or_default()
256-
.split_whitespace()
257-
.map(|s| s.to_string())
258-
.collect::<Vec<_>>()
254+
let var = env::var(format!("{}_ARGS", name.to_uppercase())).unwrap_or_default();
255+
256+
shlex::split(&var).unwrap_or_else(|| {
257+
var.split_whitespace()
258+
.map(|s| s.to_string())
259+
.collect::<Vec<_>>()
260+
})
259261
};
260262

261263
let drivers = [

0 commit comments

Comments
 (0)