fix: test execution with external Nginx source tree

Author: bavshin-f5

nginx-sys/build/wrapper.h

@@ -9,3 +9,15 @@ const size_t NGX_RS_HTTP_SRV_CONF_OFFSET = NGX_HTTP_SRV_CONF_OFFSET;
 const size_t NGX_RS_HTTP_LOC_CONF_OFFSET = NGX_HTTP_LOC_CONF_OFFSET;
 
 const char *NGX_RS_MODULE_SIGNATURE = NGX_MODULE_SIGNATURE;
+
+#ifdef NGX_PREFIX
+const char *NGX_RS_PREFIX = NGX_PREFIX;
+#else
+const char NGX_RS_PREFIX[] = {};
+#endif
+
+#ifdef NGX_CONF_PREFIX
+const char *NGX_RS_CONF_PREFIX = NGX_CONF_PREFIX;
+#else
+const char NGX_RS_CONF_PREFIX[] = {};
+#endif

nginx-sys/src/lib.rs

@@ -31,9 +31,13 @@
 #![warn(missing_docs)]
 
 use std::fmt;
+use std::path::PathBuf;
 use std::ptr::copy_nonoverlapping;
 use std::slice;
 
+#[cfg(unix)]
+use std::{ffi::OsStr, os::unix::ffi::OsStrExt};
+
 #[doc(hidden)]
 mod bindings {
     #![allow(missing_docs)]
@@ -49,6 +53,33 @@ mod bindings {
 #[doc(no_inline)]
 pub use bindings::*;
 
+/// Convert a NULL-terminated u8 slice to a PathBuf
+#[cfg(unix)]
+pub fn uchar_to_path(mut val: &[u8]) -> Option<PathBuf> {
+    while let Some(trimmed) = val.strip_suffix(b"\0") {
+        val = trimmed;
+    }
+
+    if val.is_empty() {
+        return None;
+    }
+
+    let s = OsStr::from_bytes(val);
+    Some(std::path::PathBuf::from(s))
+}
+
+/// Returns configured Nginx installation prefix (NGX_PREFIX)
+pub fn ngx_install_path() -> Option<PathBuf> {
+    #[cfg(unix)]
+    {
+        uchar_to_path(bindings::NGX_RS_PREFIX)
+    }
+    #[cfg(not(unix))]
+    {
+        None
+    }
+}
+
 /// Convert a string slice (`&str`) to a raw pointer (`*mut u_char`) allocated in the given nginx memory pool.
 ///
 /// # Arguments

tests/log_test.rs

@@ -1,38 +1,35 @@
-use std::env;
 use std::fs;
 use std::io::Result;
+use std::path::{Path, PathBuf};
 use std::process::Command;
 use std::process::Output;
 
-const NGX_DEFAULT_VERSION: &str = "1.24.0";
-const NGINX_BIN: &str = "sbin/nginx";
-const NGINX_CONFIG: &str = "conf/nginx.conf";
+use ngx::ffi::{NGX_CONF_PATH, NGX_SBIN_PATH};
 
 /// harness to test nginx
 pub struct Nginx {
-    pub install_path: String,
+    pub install_path: PathBuf,
 }
 
 impl Default for Nginx {
     /// create nginx with default
     fn default() -> Nginx {
-        let path = env::current_dir().unwrap();
-        let version = env::var("NGX_VERSION").unwrap_or(NGX_DEFAULT_VERSION.into());
-        let platform = target_triple::TARGET;
-        let ngx_path = format!(".cache/nginx/{}/{}", version, platform);
-        let install_path = format!("{}/{}", path.display(), ngx_path);
+        let install_path = ngx::ffi::ngx_install_path().expect("installation prefix");
         Nginx { install_path }
     }
 }
 
 impl Nginx {
-    pub fn new(path: String) -> Nginx {
-        Nginx { install_path: path }
+    pub fn new<P: AsRef<Path>>(path: P) -> Nginx {
+        Nginx {
+            install_path: path.as_ref().into(),
+        }
     }
 
     /// get bin path to nginx instance
-    pub fn bin_path(&mut self) -> String {
-        format!("{}/{}", self.install_path, NGINX_BIN)
+    pub fn bin_path(&mut self) -> PathBuf {
+        let bin_path = ngx::ffi::uchar_to_path(NGX_SBIN_PATH).expect("binary path");
+        self.install_path.join(bin_path)
     }
 
     /// start nginx process with arguments
@@ -70,9 +67,10 @@ impl Nginx {
     }
 
     // replace config with another config
-    pub fn replace_config(&mut self, from: &str) -> Result<u64> {
-        let config_path = format!("{}/{}", self.install_path, NGINX_CONFIG);
-        println!("copying config from: {} to: {}", from, config_path); // replace with logging
+    pub fn replace_config(&mut self, from: impl AsRef<Path>) -> Result<u64> {
+        let config_path = ngx::ffi::uchar_to_path(NGX_CONF_PATH).expect("configuration path");
+        let config_path = self.install_path.join(config_path);
+        println!("copying config from: {:?} to: {:?}", from.as_ref(), config_path); // replace with logging
         fs::copy(from, config_path)
     }
 }
@@ -99,7 +97,7 @@ mod tests {
         );
 
         nginx
-            .replace_config(&test_config_path.to_string_lossy())
+            .replace_config(&test_config_path)
             .expect(format!("Unable to load config file: {}", test_config_path.to_string_lossy()).as_str());
         let output = nginx.restart().expect("Unable to restart NGINX");
         assert!(output.status.success());