Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 99 additions & 0 deletions crates/spk-cli/cmd-build/src/cmd_build_test/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,105 @@ build:
}
}

#[spfstest]
#[rstest]
#[case::cli("cli")]
#[case::checks("checks")]
#[case::resolvo("resolvo")]
#[tokio::test]
async fn test_build_var_name_collides_with_package_name(
tmpdir: tempfile::TempDir,
#[case] solver_to_run: &str,
) {
let _rt = spfs_runtime().await;

build_package!(
tmpdir,
"demo.spk.yaml",
br#"
api: v0/package
pkg: demo/1.0.0

build:
options:
- var: samenameaspkg/true
script:
- "true"
"#,
solver_to_run
);

build_package!(
tmpdir,
"samenameaspkg.spk.yaml",
br#"
api: v0/package
pkg: samenameaspkg/1.2.3

build:
script:
- "true"
"#,
solver_to_run
);

build_package!(
tmpdir,
"middle.spk.yaml",
br#"
api: v0/package
pkg: middle/1.0.0

build:
options:
- pkg: demo
- var: demo.samenameaspkg/true
script:
- "true"

install:
requirements:
- pkg: demo
fromBuildEnv: true
- var: demo.samenameaspkg/true
"#,
solver_to_run
);

let result = try_build_package!(
tmpdir,
"consumer.spk.yaml",
br#"
api: v0/package
pkg: consumer/1.0.0

build:
options:
- pkg: samenameaspkg
- pkg: middle
script:
- "true"
"#,
solver_to_run
)
.1;

match solver_to_run {
"resolvo" => {
result.expect("Expected build of consumer to succeed with resolvo");
}
_ => {
// The step-based solvers (cli, checks) incorrectly reject
// this build because VarRequirementsValidator matches
// option keys by base_name: demo.samenameaspkg=true
// collides with the package option samenameaspkg=~1.2.3.
result.expect_err(
"Expected build of consumer to fail with step solver due to base_name collision",
);
}
}
}

#[spfstest]
#[rstest]
#[case::cli("cli")]
Expand Down
1 change: 1 addition & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,7 @@
"rustup",
"rwlock",
"safeseh",
"samenameaspkg",
"sccache",
"sched",
"sddl",
Expand Down
Loading