Skip to content

Commit 377db3c

Browse files
committed
Explicitly enable build from source in tests
Don't assume it is enabled by default. Currently it is not enabled by default in the new solver. Signed-off-by: J Robert Ray <[email protected]>
1 parent 1cacf9d commit 377db3c

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

crates/spk-solve/src/solver_test.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,6 +1000,7 @@ async fn test_solver_build_from_source_unsolvable(#[case] mut solver: SolverImpl
10001000
repo.publish_recipe(&recipe).await.unwrap();
10011001

10021002
solver.add_repository(Arc::new(repo));
1003+
solver.set_binary_only(false);
10031004
// the new option value should disqualify the existing build
10041005
// and there is no 6.3 that can be resolved for this request
10051006
solver.add_request(request!({"var": "gcc/6.3"}));
@@ -1080,8 +1081,8 @@ async fn test_solver_build_from_source_dependency(#[case] mut solver: SolverImpl
10801081
// but a new one should be generated for this set of options
10811082
solver.update_options(option_map! {"debug" => "on"});
10821083
solver.add_repository(Arc::new(repo));
1083-
solver.add_request(request!("my-tool"));
10841084
solver.set_binary_only(false);
1085+
solver.add_request(request!("my-tool"));
10851086

10861087
let solution = run_and_print_resolve_for_tests(&mut solver).await.unwrap();
10871088

@@ -1208,6 +1209,7 @@ async fn test_solver_build_from_source_deprecated(#[case] mut solver: SolverImpl
12081209
repo.force_publish_recipe(&spec).await.unwrap();
12091210

12101211
solver.add_repository(Arc::new(repo));
1212+
solver.set_binary_only(false);
12111213
solver.add_request(request!({"var": "debug/on"}));
12121214
solver.add_request(request!("my-tool"));
12131215

@@ -1253,6 +1255,7 @@ async fn test_solver_build_from_source_deprecated_and_impossible_initial_checks(
12531255
repo.force_publish_recipe(&spec).await.unwrap();
12541256

12551257
solver.add_repository(Arc::new(repo));
1258+
solver.set_binary_only(false);
12561259
solver.add_request(request!({"var": "debug/on"}));
12571260
solver.add_request(request!("my-tool"));
12581261
if let SolverImpl::Og(ref mut solver) = solver {

0 commit comments

Comments
 (0)