C unit tests

Author: kornelski

Cargo.lock

@@ -1,5 +1,15 @@
 [workspace]
-members = ["imageflow_helpers", "imageflow_types", "imageflow_riapi", "imageflow_core", "imageflow_abi", "imageflow_tool", "imageflow_server"]
+members = [
+    "imageflow_helpers",
+    "imageflow_types",
+    "imageflow_riapi",
+    "imageflow_core",
+    "imageflow_abi",
+    "imageflow_tool",
+    "imageflow_server",
+    "c_components",
+    "c_components/tests",
+]
 
 [dependencies.regex]
 features=["pattern"]
@@ -9,4 +19,4 @@ debug = true
 
 # RIAPI Tests take 600ms each at 0, 200ms each at 1, 36ms each at 2, 26ms each at 3
 [profile.test]
-opt-level = 1
+opt-level = 1

Cargo.toml

@@ -4,6 +4,7 @@ version = "0.1.0"
 authors = ["Nathanael Jones <[email protected]>", "Kornel Lesiński <[email protected]>"]
 links = "imageflow_c"
 workspace = "../"
+build = "build.rs"
 
 [lib]
 name = "imageflow_c_components"

c_components/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "c_components_tests"
+version = "0.1.0"
+authors = ["Nathanael Jones <[email protected]>", "Kornel Lesiński <[email protected]>"]
+workspace = "../../"
+build = "src/build.rs"
+
+[dependencies]
+imageflow_c_components = {path = ".."}
+lcms2-sys = "2.4.8"
+libpng-sys = "0.2.3"
+
+[build-dependencies.cc]
+version = "1.0.3"
+features = ["parallel"]

c_components/tests/Cargo.toml

@@ -191,7 +191,7 @@ bool create_path_from_relative(flow_c * c, const char * base_file, bool create_p
         return false;
     }
     const char * this_file = base_file;
-    char * last_slash = strrchr(this_file, '/');
+    const char * last_slash = strrchr(this_file, '/');
     if (last_slash == NULL) {
         last_slash = strrchr(this_file, '\\');
     }

c_components/tests/helpers.c

@@ -1,2 +1,6 @@
-#define CATCH_CONFIG_MAIN // tell catch to generate main
-#include "catch.hpp"
+#define CATCH_CONFIG_RUNNER
+#include "catch.hpp"
+
+extern "C" int run_c_components_tests() {
+    return Catch::Session().run( 0, NULL );
+}

c_components/tests/runner.cpp

@@ -0,0 +1,38 @@
+extern crate cc;
+use std::env;
+use std::path::PathBuf;
+
+fn main() {
+    let mut cc = cc::Build::new();
+    cc.warnings(false);
+
+    for path in env::split_paths(&env::var_os("DEP_PNG_INCLUDE").expect("include paths from libpng-sys")) {
+        cc.include(path);
+    }
+    for path in env::split_paths(&env::var_os("DEP_LCMS2_INCLUDE").expect("include paths from lcms2-sys")) {
+        cc.include(path);
+    }
+
+    let test_root = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
+    let c_root = test_root.parent().unwrap();
+    cc.include(c_root.join("lib"));
+    cc.include(c_root);
+    cc.include(&test_root);
+
+    cc.cpp(true);
+    cc.flag("-std=c++11");
+
+    // the C code wants __FILE__ to contain slashes
+    cc.file(test_root.join("runner.cpp"));
+    cc.file(test_root.join("test.cpp"));
+    cc.file(test_root.join("helpers.c"));
+    cc.file(test_root.join("test_context.cpp"));
+    cc.file(test_root.join("test_error_handling.cpp"));
+    cc.file(test_root.join("test_integration.cpp"));
+    cc.file(test_root.join("test_io.cpp"));
+    cc.file(test_root.join("test_operations.cpp"));
+    cc.file(test_root.join("test_variations.cpp"));
+    cc.file(test_root.join("test_weighting.cpp"));
+    cc.file(test_root.join("test_weighting_helpers.cpp"));
+    cc.compile("imageflow_c_tests");
+}

c_components/tests/src/build.rs

@@ -0,0 +1,12 @@
+extern crate imageflow_c_components;
+
+extern "C" {
+    pub fn run_c_components_tests() -> std::os::raw::c_int;
+}
+
+#[test]
+fn c_catch() {
+    unsafe {
+        assert!(0 == run_c_components_tests());
+    }
+}