diff options
author | Neal H. Walfield <neal@pep.foundation> | 2018-07-28 11:50:51 +0200 |
---|---|---|
committer | Neal H. Walfield <neal@pep.foundation> | 2018-07-28 11:50:51 +0200 |
commit | 94b8c8b4e7f5c26c06474614c276514e8f824723 (patch) | |
tree | 8233707100e613c76279dc26509588c44dffe7fc /ffi/tests | |
parent | 522281e2fbea4b719ca0d69f0f06d46dd6b3923e (diff) |
ffi: Fix paths when building c tests.
- Fixes 0a9a235f.
Diffstat (limited to 'ffi/tests')
-rw-r--r-- | ffi/tests/c-tests.rs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ffi/tests/c-tests.rs b/ffi/tests/c-tests.rs index 549f65c1..44060fcd 100644 --- a/ffi/tests/c-tests.rs +++ b/ffi/tests/c-tests.rs @@ -19,6 +19,7 @@ use nettle::hash::{Hash, Sha256}; /// Hooks into Rust's test system to extract, compile and run c tests. #[test] fn c_doctests() { + // The location of this crate's (i.e., the ffi crate's) source. let manifest_dir = PathBuf::from( var_os("CARGO_MANIFEST_DIR") .as_ref() @@ -27,18 +28,24 @@ fn c_doctests() { let src = manifest_dir.join("src"); let include = manifest_dir.join("include"); + // The top-level directory. + let toplevel = manifest_dir.parent().unwrap(); + + // The location of the binaries. let target_dir = if let Some(dir) = var_os("CARGO_TARGET_DIR") { PathBuf::from(dir) } else { - manifest_dir.join("target") + toplevel.join("target") }; + // The debug target. let debug = target_dir.join("debug"); + // Where we put our files. let target = target_dir.join("c-tests"); fs::create_dir_all(&target).unwrap(); // First of all, make sure the shared object is built. - build_so(&manifest_dir).unwrap(); + build_so(toplevel).unwrap(); let mut n = 0; let mut passed = 0; |