Skip to content

Commit c72df9d

Browse files
author
Kai Luo
committed
AIX uses .a as dylib's suffix
1 parent 3d68afc commit c72df9d

File tree

1 file changed

+27
-5
lines changed

1 file changed

+27
-5
lines changed

src/tools/compiletest/src/runtest.rs

+27-5
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ fn get_lib_name(lib: &str, aux_type: AuxType) -> Option<String> {
9494
format!("{}.dll", lib)
9595
} else if cfg!(target_vendor = "apple") {
9696
format!("lib{}.dylib", lib)
97+
} else if cfg!(target_os = "aix") {
98+
format!("lib{}.a", lib)
9799
} else {
98100
format!("lib{}.so", lib)
99101
}),
@@ -278,11 +280,19 @@ impl<'test> TestCx<'test> {
278280
Ui | MirOpt => false,
279281
mode => panic!("unimplemented for mode {:?}", mode),
280282
};
281-
if test_should_run { self.run_if_enabled() } else { WillExecute::No }
283+
if test_should_run {
284+
self.run_if_enabled()
285+
} else {
286+
WillExecute::No
287+
}
282288
}
283289

284290
fn run_if_enabled(&self) -> WillExecute {
285-
if self.config.run_enabled() { WillExecute::Yes } else { WillExecute::Disabled }
291+
if self.config.run_enabled() {
292+
WillExecute::Yes
293+
} else {
294+
WillExecute::Disabled
295+
}
286296
}
287297

288298
fn should_run_successfully(&self, pm: Option<PassMode>) -> bool {
@@ -2441,7 +2451,11 @@ impl<'test> TestCx<'test> {
24412451
/// The revision, ignored for incremental compilation since it wants all revisions in
24422452
/// the same directory.
24432453
fn safe_revision(&self) -> Option<&str> {
2444-
if self.config.mode == Incremental { None } else { self.revision }
2454+
if self.config.mode == Incremental {
2455+
None
2456+
} else {
2457+
self.revision
2458+
}
24452459
}
24462460

24472461
/// Gets the absolute path to the directory where all output for the given
@@ -2665,7 +2679,11 @@ impl<'test> TestCx<'test> {
26652679

26662680
fn charset() -> &'static str {
26672681
// FreeBSD 10.1 defaults to GDB 6.1.1 which doesn't support "auto" charset
2668-
if cfg!(target_os = "freebsd") { "ISO-8859-1" } else { "UTF-8" }
2682+
if cfg!(target_os = "freebsd") {
2683+
"ISO-8859-1"
2684+
} else {
2685+
"UTF-8"
2686+
}
26692687
}
26702688

26712689
fn run_rustdoc_test(&self) {
@@ -4488,7 +4506,11 @@ impl<'test> TestCx<'test> {
44884506
for output_file in files {
44894507
println!("Actual {} saved to {}", kind, output_file.display());
44904508
}
4491-
if self.config.bless { 0 } else { 1 }
4509+
if self.config.bless {
4510+
0
4511+
} else {
4512+
1
4513+
}
44924514
}
44934515

44944516
fn check_and_prune_duplicate_outputs(

0 commit comments

Comments
 (0)