Skip to content

Commit ece3ce6

Browse files
quakem4b
authored andcommitted
test: remove hardcoded CommandLineTools path in macos test
1 parent e94ca6b commit ece3ce6

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed

tests/compare_dyldinfos.rs

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
use std::process;
22

3+
fn get_realpath(cmd: &str) -> String {
4+
let output = process::Command::new("/usr/bin/xcrun")
5+
.arg("-f")
6+
.arg(cmd)
7+
.output()
8+
.expect("can get realpath");
9+
String::from_utf8(output.stdout).expect("output is valid utf8")
10+
}
11+
312
pub fn compare(args: Vec<&str>) {
4-
let apple = process::Command::new("/Library/Developer/CommandLineTools/usr/bin/dyldinfo")
13+
let apple = process::Command::new("/usr/bin/xcrun")
14+
.arg("dyldinfo")
515
.args(&args)
616
.output()
717
.expect("run Apple dyldinfo");
@@ -39,39 +49,28 @@ pub fn compare(args: Vec<&str>) {
3949
#[cfg(target_os = "macos")]
4050
#[test]
4151
fn compare_binds() {
42-
compare(vec![
43-
"-bind",
44-
"/Library/Developer/CommandLineTools/usr/bin/dyldinfo",
45-
]);
46-
compare(vec![
47-
"-bind",
48-
"/Library/Developer/CommandLineTools/usr/bin/clang",
49-
]);
52+
let dyldinfo = get_realpath("dyldinfo");
53+
let clang = get_realpath("clang");
54+
compare(vec!["-bind", &dyldinfo]);
55+
compare(vec!["-bind", &clang]);
5056
compare(vec!["-bind", "/usr/bin/tmutil"]);
5157
}
5258

5359
#[cfg(target_os = "macos")]
5460
#[test]
5561
fn compare_lazy_binds() {
56-
compare(vec![
57-
"-lazy_bind",
58-
"/Library/Developer/CommandLineTools/usr/bin/dyldinfo",
59-
]);
60-
compare(vec![
61-
"-lazy_bind",
62-
"/Library/Developer/CommandLineTools/usr/bin/clang",
63-
]);
62+
let dyldinfo = get_realpath("dyldinfo");
63+
let clang = get_realpath("clang");
64+
compare(vec!["-lazy_bind", &dyldinfo]);
65+
compare(vec!["-lazy_bind", &clang]);
6466
compare(vec!["-lazy_bind", "/usr/bin/tmutil"]);
6567
}
6668

6769
#[cfg(target_os = "macos")]
6870
#[test]
6971
fn compare_combined_options() {
70-
compare(vec![
71-
"-lazy_bind",
72-
"-bind",
73-
"/Library/Developer/CommandLineTools/usr/bin/dyldinfo",
74-
]);
72+
let dyldinfo = get_realpath("dyldinfo");
73+
compare(vec!["-lazy_bind", "-bind", &dyldinfo]);
7574
}
7675

7776
#[cfg(not(target_os = "macos"))]

0 commit comments

Comments
 (0)