diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2019-03-21 15:24:41 +0100 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2019-03-21 15:24:41 +0100 |
commit | c0a170a65cdc587c76787c3fc988be77bf4f6675 (patch) | |
tree | 5f0c69b1526c0526882758579e19de0a80fbd0b4 | |
parent | e4998146b6e68360f81c9d44d5e57008613b5f73 (diff) |
openpgp-ffi: Use crate for futimes fiddling.
- The previous solution of using libc::futimes turned out to be not
portable because different platforms have differently sized
timestamps. Use a crate for that instead.
- Also, bring ffi's c-tests up-to-speed.
- Fixes #225.
-rw-r--r-- | ffi/Cargo.toml | 1 | ||||
-rw-r--r-- | ffi/tests/c-tests.rs | 75 | ||||
-rw-r--r-- | openpgp-ffi/Cargo.toml | 1 | ||||
-rw-r--r-- | openpgp-ffi/tests/c-tests.rs | 26 |
4 files changed, 40 insertions, 63 deletions
diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml index 25e44874..d49b1bbf 100644 --- a/ffi/Cargo.toml +++ b/ffi/Cargo.toml @@ -34,6 +34,7 @@ native-tls = "0.2.0" time = "0.1.40" [dev-dependencies] +filetime = "0.2" nettle = "5.0" [lib] diff --git a/ffi/tests/c-tests.rs b/ffi/tests/c-tests.rs index 9397476d..5dfa56b7 100644 --- a/ffi/tests/c-tests.rs +++ b/ffi/tests/c-tests.rs @@ -1,21 +1,16 @@ -extern crate libc; +extern crate filetime; extern crate nettle; use std::cmp::min; use std::env::{self, var_os}; use std::ffi::OsStr; -use std::fmt::Write as FmtWrite; use std::fs; use std::io::{self, BufRead, Write}; -use std::os::unix::io::AsRawFd; use std::path::{Path, PathBuf}; use std::process::Command; use std::str::FromStr; -use std::time; use std::mem::replace; -use nettle::hash::{Hash, Sha256}; - /// Hooks into Rust's test system to extract, compile and run c tests. #[test] fn c_doctests() { @@ -118,7 +113,26 @@ fn for_all_rs<F>(src: &Path, mut fun: F) Ok(()) } +/// If this looks like an exported function, returns its name. +fn exported_function_name(line: &str) -> Option<&str> { + if line.starts_with("pub extern \"system\" fn ") + || line.starts_with("fn pgp_") + { + let fn_i = line.find("fn ")?; + let name_start = fn_i + 3; + (&line[name_start..]).split(|c| !is_valid_identifier(c)).next() + } else { + None + } +} + +fn is_valid_identifier(c: char) -> bool { + char::is_alphanumeric(c) || c == '_' +} + /// Maps the given function `fun` over all tests found in `path`. +/// +/// XXX: We need to parse the file properly with syn. fn for_all_tests<F>(path: &Path, mut fun: F) -> io::Result<()> where F: FnMut(&Path, usize, &str, Vec<String>, bool) -> io::Result<()> { @@ -144,12 +158,12 @@ fn for_all_tests<F>(path: &Path, mut fun: F) continue; } - if line.starts_with("pub extern \"system\" fn ") && test.len() > 0 { - let name = &line[23..].split_terminator('(') - .next().unwrap().to_owned(); - fun(path, test_starts_at, &name, replace(&mut test, Vec::new()), - run)?; - test.clear(); + if let Some(name) = exported_function_name(&line) { + if test.len() > 0 { + fun(path, test_starts_at, &name, replace(&mut test, vec![]), + run)?; + test.clear(); + } } } else { if line == "/// ```" { @@ -158,18 +172,9 @@ fn for_all_tests<F>(path: &Path, mut fun: F) } if line == "//! ```" && test.len() > 0 { - let mut hash = Sha256::default(); - for line in test.iter() { - writeln!(&mut hash as &mut Hash, "{}", line).unwrap(); - } - let mut digest = vec![0; hash.digest_size()]; - hash.digest(&mut digest); - let mut name = String::new(); - write!(&mut name, "{}_", - path.file_stem().unwrap().to_string_lossy()).unwrap(); - for b in digest { - write!(&mut name, "{:02x}", b).unwrap(); - } + let name = format!("{}_{}", + path.file_stem().unwrap().to_string_lossy(), + lineno); // XXX: nicer to point to the top fun(path, test_starts_at, &name, replace(&mut test, Vec::new()), run)?; @@ -207,27 +212,13 @@ fn build(include_dirs: &[PathBuf], ldpath: &Path, target_dir: &Path, for line in lines { writeln!(f, "{}", line)? } + drop(f); // Change the modification time of the c source to match the // rust source. - let mtime = meta_rs.modified().unwrap() - .duration_since(time::UNIX_EPOCH).unwrap(); - let timevals = [ - // Access time. - libc::timeval { - tv_sec: mtime.as_secs() as i64, - tv_usec: mtime.subsec_nanos() as i64 / 1000, - }, - // Modification time. - libc::timeval { - tv_sec: mtime.as_secs() as i64, - tv_usec: mtime.subsec_nanos() as i64 / 1000, - }, - ]; - let rc = unsafe { - libc::futimes(f.as_raw_fd(), timevals.as_ptr()) - }; - assert_eq!(rc, 0); + use filetime::FileTime; + let mtime = FileTime::from_last_modification_time(&meta_rs); + filetime::set_file_times(target_c, mtime.clone(), mtime).unwrap(); } let includes = diff --git a/openpgp-ffi/Cargo.toml b/openpgp-ffi/Cargo.toml index 5c9a272a..9cb1d4ef 100644 --- a/openpgp-ffi/Cargo.toml +++ b/openpgp-ffi/Cargo.toml @@ -30,6 +30,7 @@ memsec = "0.5.4" time = "0.1.40" [dev-dependencies] +filetime = "0.2" nettle = "5.0" [lib] diff --git a/openpgp-ffi/tests/c-tests.rs b/openpgp-ffi/tests/c-tests.rs index 0ec26500..37c00231 100644 --- a/openpgp-ffi/tests/c-tests.rs +++ b/openpgp-ffi/tests/c-tests.rs @@ -1,4 +1,4 @@ -extern crate libc; +extern crate filetime; extern crate nettle; use std::cmp::min; @@ -6,11 +6,9 @@ use std::env::{self, var_os}; use std::ffi::OsStr; use std::fs; use std::io::{self, BufRead, Write}; -use std::os::unix::io::AsRawFd; use std::path::{Path, PathBuf}; use std::process::Command; use std::str::FromStr; -use std::time; use std::mem::replace; /// Hooks into Rust's test system to extract, compile and run c tests. @@ -213,27 +211,13 @@ fn build(include_dirs: &[PathBuf], ldpath: &Path, target_dir: &Path, for line in lines { writeln!(f, "{}", line)? } + drop(f); // Change the modification time of the c source to match the // rust source. - let mtime = meta_rs.modified().unwrap() - .duration_since(time::UNIX_EPOCH).unwrap(); - let timevals = [ - // Access time. - libc::timeval { - tv_sec: mtime.as_secs() as i64, - tv_usec: mtime.subsec_nanos() as i64 / 1000, - }, - // Modification time. - libc::timeval { - tv_sec: mtime.as_secs() as i64, - tv_usec: mtime.subsec_nanos() as i64 / 1000, - }, - ]; - let rc = unsafe { - libc::futimes(f.as_raw_fd(), timevals.as_ptr()) - }; - assert_eq!(rc, 0); + use filetime::FileTime; + let mtime = FileTime::from_last_modification_time(&meta_rs); + filetime::set_file_times(target_c, mtime.clone(), mtime).unwrap(); } let includes = |