Skip to content

Commit 61e50b6

Browse files
Improved how references test handles paths (#4242)
1 parent f1d60ab commit 61e50b6

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

crates/cli/tests/reference.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fn main() -> Result<()> {
4242
let filter = env::args().nth(1);
4343

4444
let mut tests = Vec::new();
45-
let dir = env::current_dir()?.join("tests/reference");
45+
let dir = repo_root().join("crates/cli/tests/reference");
4646
for entry in dir.read_dir()? {
4747
let path = entry?.path();
4848
if path.extension().and_then(|s| s.to_str()) != Some("rs") {
@@ -224,19 +224,15 @@ fn diff(a: &str, b: &str) -> Result<()> {
224224
}
225225

226226
fn target_dir() -> PathBuf {
227-
let mut dir = env::current_exe().unwrap();
228-
dir.pop(); // current exe
229-
if dir.ends_with("deps") {
230-
dir.pop();
231-
}
232-
dir.pop(); // debug and/or release
233-
dir
227+
repo_root().join("target/tests/reference")
234228
}
235229

236230
fn repo_root() -> PathBuf {
237231
let mut repo_root = env::current_dir().unwrap();
238-
repo_root.pop(); // remove 'cli'
239-
repo_root.pop(); // remove 'crates'
232+
if repo_root.file_name() == Some("cli".as_ref()) {
233+
repo_root.pop(); // remove 'cli'
234+
repo_root.pop(); // remove 'crates'
235+
}
240236
repo_root
241237
}
242238

0 commit comments

Comments
 (0)