Skip to content

Commit d63deff

Browse files
DaniPopesmikelodder7
authored andcommitted
test: fix some windows tests (foundry-rs#5671)
1 parent f1d1509 commit d63deff

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

crates/forge/tests/cli/config.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,13 @@ forgetest_init!(
223223
let profile = Config::load_with_root(prj.root());
224224
// ensure that the auto-generated internal remapping for forge-std's ds-test exists
225225
assert_eq!(profile.remappings.len(), 2);
226-
pretty_eq!("ds-test/=lib/forge-std/lib/ds-test/src/", profile.remappings[0].to_string());
226+
let [r, _] = &profile.remappings[..] else { unreachable!() };
227+
pretty_eq!("ds-test/=lib/forge-std/lib/ds-test/src/", r.to_string());
227228

228-
// ensure remappings contain test
229-
pretty_eq!("ds-test/=lib/forge-std/lib/ds-test/src/", profile.remappings[0].to_string());
230229
// the loaded config has resolved, absolute paths
231230
pretty_eq!(
232231
"ds-test/=lib/forge-std/lib/ds-test/src/",
233-
Remapping::from(profile.remappings[0].clone()).to_string()
232+
Remapping::from(r.clone()).to_string()
234233
);
235234

236235
cmd.arg("config");
@@ -250,14 +249,18 @@ forgetest_init!(
250249
"solmate/=lib/solmate/src/\nsolmate-contracts/=lib/solmate/src/",
251250
);
252251
let config = forge_utils::load_config_with_root(Some(prj.root().into()));
252+
// trailing slashes are removed on windows `to_slash_lossy`
253+
let path = prj.root().join("lib/solmate/src/").to_slash_lossy().into_owned();
254+
#[cfg(windows)]
255+
let path = path + "/";
253256
pretty_eq!(
254-
format!("solmate/={}", prj.root().join("lib/solmate/src/").to_slash_lossy()),
257+
format!("solmate/={path}"),
255258
Remapping::from(config.remappings[0].clone()).to_string()
256259
);
257260
// As this is an user-generated remapping, it is not removed, even if it points to the same
258261
// location.
259262
pretty_eq!(
260-
format!("solmate-contracts/={}", prj.root().join("lib/solmate/src/").to_slash_lossy()),
263+
format!("solmate-contracts/={path}"),
261264
Remapping::from(config.remappings[1].clone()).to_string()
262265
);
263266
pretty_err(&remappings_txt, fs::remove_file(&remappings_txt));

crates/forge/tests/it/invariant.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ async fn test_invariant_storage() {
114114
let mut runner = runner().await;
115115

116116
let mut opts = test_opts();
117-
opts.invariant.depth = 100;
117+
opts.invariant.depth = 100 + (50 * cfg!(windows) as u32);
118118
opts.fuzz.seed = Some(U256::from(6u32));
119119
runner.test_options = opts.clone();
120120

0 commit comments

Comments
 (0)