Commit763d8eb

authored

feat: Enhance logging and testing utilities (#215)

1 parenta21896f commit763d8ebCopy full SHA for 763d8eb

File tree

+426

-195

lines changed

+426

-195

lines changed

Lines changed: 80 additions & 1 deletion

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,5 @@`
`9`	`9`	`// See the Mulan PSL v2 for more details.`
`10`	`10`
`11`	`11`	`fnmain(){`
`12`		`- phper_build::register_configures();`
`13`		`-`
`14`		`-#[cfg(target_os ="macos")]`
`15`		`-{`
`16`		`-println!("cargo:rustc-link-arg=-undefined");`
`17`		`-println!("cargo:rustc-link-arg=dynamic_lookup");`
`18`		`-}`
	`12`	`+ phper_build::register_all();`
`19`	`13`	`}`

Lines changed: 18 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,25 +8,29 @@`
`8`	`8`	`// NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.`
`9`	`9`	`// See the Mulan PSL v2 for more details.`
`10`	`10`
`11`		`-use phper_test::{cli::test_php_scripts, utils::get_lib_path};`
	`11`	`+use phper_test::{cargo::CargoBuilder, cli::test_php_script, log};`
`12`	`12`	`use std::{`
`13`	`13`	`env,`
`14`	`14`	`path::{Path,PathBuf},`
	`15`	`+ sync::LazyLock,`
`15`	`16`	`};`
`16`	`17`
	`18`	`+pubstaticDYLIB_PATH:LazyLock<PathBuf> =LazyLock::new(\|\|{`
	`19`	`+ log::setup();`
	`20`	`+let result =CargoBuilder::new()`
	`21`	`+.current_dir(env!("CARGO_MANIFEST_DIR"))`
	`22`	`+.build()`
	`23`	`+.unwrap();`
	`24`	`+ result.get_cdylib().unwrap()`
	`25`	`+});`
	`26`	`+`
	`27`	`+pubstaticTESTS_PHP_DIR:LazyLock<PathBuf> =LazyLock::new(\|\|{`
	`28`	`+Path::new(env!("CARGO_MANIFEST_DIR"))`
	`29`	`+.join("tests")`
	`30`	`+.join("php")`
	`31`	`+});`
	`32`	`+`
`17`	`33`	`#[test]`
`18`	`34`	`fntest_php(){`
`19`		`-test_php_scripts(`
`20`		`-get_lib_path(`
`21`		`-PathBuf::from(env!("CARGO_MANIFEST_DIR"))`
`22`		`-.join("..")`
`23`		`-.join("..")`
`24`		`-.join("target"),`
`25`		`-"complex",`
`26`		`-),`
`27`		`-&[&Path::new(env!("CARGO_MANIFEST_DIR"))`
`28`		`-.join("tests")`
`29`		`-.join("php")`
`30`		`-.join("test.php")],`
`31`		`-);`
	`35`	`+test_php_script(&*DYLIB_PATH,TESTS_PHP_DIR.join("test.php"));`
`32`	`36`	`}`

Lines changed: 18 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,25 +8,29 @@`
`8`	`8`	`// NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.`
`9`	`9`	`// See the Mulan PSL v2 for more details.`
`10`	`10`
`11`		`-use phper_test::{cli::test_php_scripts, utils::get_lib_path};`
	`11`	`+use phper_test::{cargo::CargoBuilder, cli::test_php_script, log};`
`12`	`12`	`use std::{`
`13`	`13`	`env,`
`14`	`14`	`path::{Path,PathBuf},`
	`15`	`+ sync::LazyLock,`
`15`	`16`	`};`
`16`	`17`
	`18`	`+pubstaticDYLIB_PATH:LazyLock<PathBuf> =LazyLock::new(\|\|{`
	`19`	`+ log::setup();`
	`20`	`+let result =CargoBuilder::new()`
	`21`	`+.current_dir(env!("CARGO_MANIFEST_DIR"))`
	`22`	`+.build()`
	`23`	`+.unwrap();`
	`24`	`+ result.get_cdylib().unwrap()`
	`25`	`+});`
	`26`	`+`
	`27`	`+pubstaticTESTS_PHP_DIR:LazyLock<PathBuf> =LazyLock::new(\|\|{`
	`28`	`+Path::new(env!("CARGO_MANIFEST_DIR"))`
	`29`	`+.join("tests")`
	`30`	`+.join("php")`
	`31`	`+});`
	`32`	`+`
`17`	`33`	`#[test]`
`18`	`34`	`fntest_php(){`
`19`		`-test_php_scripts(`
`20`		`-get_lib_path(`
`21`		`-PathBuf::from(env!("CARGO_MANIFEST_DIR"))`
`22`		`-.join("..")`
`23`		`-.join("..")`
`24`		`-.join("target"),`
`25`		`-"http_client",`
`26`		`-),`
`27`		`-&[&Path::new(env!("CARGO_MANIFEST_DIR"))`
`28`		`-.join("tests")`
`29`		`-.join("php")`
`30`		`-.join("test.php")],`
`31`		`-);`
	`35`	`+test_php_script(&*DYLIB_PATH,TESTS_PHP_DIR.join("test.php"));`
`32`	`36`	`}`

Lines changed: 12 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,25 +10,29 @@`
`10`	`10`
`11`	`11`	`use axum::http::header::CONTENT_TYPE;`
`12`	`12`	`use hyper::StatusCode;`
`13`		`-use phper_test::{cli::test_long_term_php_script_with_condition, utils::get_lib_path};`
	`13`	`+use phper_test::{cargo::CargoBuilder, cli::test_long_term_php_script_with_condition, log};`
`14`	`14`	`use reqwest::blocking::Client;`
`15`	`15`	`use std::{`
`16`	`16`	`env,`
`17`	`17`	`path::{Path,PathBuf},`
	`18`	`+ sync::LazyLock,`
`18`	`19`	`thread::sleep,`
`19`	`20`	`time::Duration,`
`20`	`21`	`};`
`21`	`22`
	`23`	`+pubstaticDYLIB_PATH:LazyLock<PathBuf> =LazyLock::new(\|\|{`
	`24`	`+ log::setup();`
	`25`	`+let result =CargoBuilder::new()`
	`26`	`+.current_dir(env!("CARGO_MANIFEST_DIR"))`
	`27`	`+.build()`
	`28`	`+.unwrap();`
	`29`	`+ result.get_cdylib().unwrap()`
	`30`	`+});`
	`31`	`+`
`22`	`32`	`#[test]`
`23`	`33`	`fntest_php(){`
`24`	`34`	`test_long_term_php_script_with_condition(`
`25`		`-get_lib_path(`
`26`		`-PathBuf::from(env!("CARGO_MANIFEST_DIR"))`
`27`		`-.join("..")`
`28`		`-.join("..")`
`29`		`-.join("target"),`
`30`		`-"http_server",`
`31`		`-),`
	`35`	`+&*DYLIB_PATH,`
`32`	`36`	`Path::new(env!("CARGO_MANIFEST_DIR"))`
`33`	`37`	`.join("tests")`
`34`	`38`	`.join("php")`

Comments

(0)