AIX uses .a as dylib's suffix
This commit is contained in:
parent
3d68afc9e8
commit
c72df9ddf9
@ -94,6 +94,8 @@ fn get_lib_name(lib: &str, aux_type: AuxType) -> Option<String> {
|
||||
format!("{}.dll", lib)
|
||||
} else if cfg!(target_vendor = "apple") {
|
||||
format!("lib{}.dylib", lib)
|
||||
} else if cfg!(target_os = "aix") {
|
||||
format!("lib{}.a", lib)
|
||||
} else {
|
||||
format!("lib{}.so", lib)
|
||||
}),
|
||||
@ -278,11 +280,19 @@ fn should_run(&self, pm: Option<PassMode>) -> WillExecute {
|
||||
Ui | MirOpt => false,
|
||||
mode => panic!("unimplemented for mode {:?}", mode),
|
||||
};
|
||||
if test_should_run { self.run_if_enabled() } else { WillExecute::No }
|
||||
if test_should_run {
|
||||
self.run_if_enabled()
|
||||
} else {
|
||||
WillExecute::No
|
||||
}
|
||||
}
|
||||
|
||||
fn run_if_enabled(&self) -> WillExecute {
|
||||
if self.config.run_enabled() { WillExecute::Yes } else { WillExecute::Disabled }
|
||||
if self.config.run_enabled() {
|
||||
WillExecute::Yes
|
||||
} else {
|
||||
WillExecute::Disabled
|
||||
}
|
||||
}
|
||||
|
||||
fn should_run_successfully(&self, pm: Option<PassMode>) -> bool {
|
||||
@ -2441,7 +2451,11 @@ fn output_testname_unique(&self) -> PathBuf {
|
||||
/// The revision, ignored for incremental compilation since it wants all revisions in
|
||||
/// the same directory.
|
||||
fn safe_revision(&self) -> Option<&str> {
|
||||
if self.config.mode == Incremental { None } else { self.revision }
|
||||
if self.config.mode == Incremental {
|
||||
None
|
||||
} else {
|
||||
self.revision
|
||||
}
|
||||
}
|
||||
|
||||
/// Gets the absolute path to the directory where all output for the given
|
||||
@ -2665,7 +2679,11 @@ fn run_assembly_test(&self) {
|
||||
|
||||
fn charset() -> &'static str {
|
||||
// FreeBSD 10.1 defaults to GDB 6.1.1 which doesn't support "auto" charset
|
||||
if cfg!(target_os = "freebsd") { "ISO-8859-1" } else { "UTF-8" }
|
||||
if cfg!(target_os = "freebsd") {
|
||||
"ISO-8859-1"
|
||||
} else {
|
||||
"UTF-8"
|
||||
}
|
||||
}
|
||||
|
||||
fn run_rustdoc_test(&self) {
|
||||
@ -4488,7 +4506,11 @@ fn compare_output(&self, kind: &str, actual: &str, expected: &str) -> usize {
|
||||
for output_file in files {
|
||||
println!("Actual {} saved to {}", kind, output_file.display());
|
||||
}
|
||||
if self.config.bless { 0 } else { 1 }
|
||||
if self.config.bless {
|
||||
0
|
||||
} else {
|
||||
1
|
||||
}
|
||||
}
|
||||
|
||||
fn check_and_prune_duplicate_outputs(
|
||||
|
Loading…
Reference in New Issue
Block a user