diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-07-07 13:19:57 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-07 13:19:57 -0700 |
commit | 71f2410a5478ffa0f6af10c1fd8d910cafaca4f7 (patch) | |
tree | ef0a679f3b80d30777d0e6baea65392e372c7dad | |
parent | c93b1dede544d0f68a08ba32ced9530c4a27a5da (diff) | |
parent | 12e06f421d4b08b0b9b001f5300d8de50ae72c89 (diff) |
Auto merge of #796 - tz70s:master, r=fitzgen
Automatically detect libclang version when testing
Automatically detect libclang version when testing and use approppriate
expectation files.
Ref to issue #794.
-rw-r--r-- | tests/tests.rs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tests/tests.rs b/tests/tests.rs index b5ef339a..24d5770e 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -3,7 +3,7 @@ extern crate diff; extern crate bindgen; extern crate shlex; -use bindgen::{Builder, builder}; +use bindgen::{Builder, builder, clang_version}; use std::fs; use std::io::{BufRead, BufReader, Error, ErrorKind, Read, Write}; use std::path::PathBuf; @@ -39,6 +39,19 @@ fn compare_generated_header(header: &PathBuf, expected.push("libclang-3.9"); } else if cfg!(feature = "testing_only_libclang_3_8") { expected.push("libclang-3.8"); + } else { + match clang_version().parsed { + None => {}, + Some(version) => { + let (maj, min) = version; + let version_str = if maj >= 4 { + "4".to_owned() + } else { + format!("{}.{}", maj, min) + }; + expected.push(format!("libclang-{}", version_str)); + } + } } expected.push(file_name); |