diff options
Diffstat (limited to 'test_util/src')
-rw-r--r-- | test_util/src/builders.rs | 12 | ||||
-rw-r--r-- | test_util/src/lib.rs | 8 |
2 files changed, 18 insertions, 2 deletions
diff --git a/test_util/src/builders.rs b/test_util/src/builders.rs index 862838dcb..9e9c64cf5 100644 --- a/test_util/src/builders.rs +++ b/test_util/src/builders.rs @@ -20,6 +20,7 @@ use os_pipe::pipe; use crate::assertions::assert_wildcard_match; use crate::deno_exe_path; +use crate::denort_exe_path; use crate::env_vars_for_jsr_tests; use crate::env_vars_for_npm_tests; use crate::fs::PathRef; @@ -80,7 +81,7 @@ pub struct TestContextBuilder { impl TestContextBuilder { pub fn new() -> Self { - Self::default() + Self::default().add_compile_env_vars() } pub fn for_npm() -> Self { @@ -158,6 +159,13 @@ impl TestContextBuilder { self } + pub fn add_compile_env_vars(mut self) -> Self { + // The `denort` binary is in the same artifact directory as the `deno` binary. + let denort_bin = denort_exe_path(); + self = self.env("DENORT_BIN", denort_bin.to_string()); + self + } + pub fn add_jsr_env_vars(mut self) -> Self { for (key, value) in env_vars_for_jsr_tests() { self = self.env(key, value); @@ -236,7 +244,7 @@ impl Default for TestContext { impl TestContext { pub fn with_http_server() -> Self { - TestContextBuilder::default().use_http_server().build() + TestContextBuilder::new().use_http_server().build() } pub fn deno_dir(&self) -> &TempDir { diff --git a/test_util/src/lib.rs b/test_util/src/lib.rs index b750cb99a..f8fbb8b65 100644 --- a/test_util/src/lib.rs +++ b/test_util/src/lib.rs @@ -140,6 +140,14 @@ pub fn deno_exe_path() -> PathRef { PathRef::new(p) } +pub fn denort_exe_path() -> PathRef { + let mut p = target_dir().join("denort").to_path_buf(); + if cfg!(windows) { + p.set_extension("exe"); + } + PathRef::new(p) +} + pub fn prebuilt_tool_path(tool: &str) -> PathRef { let mut exe = tool.to_string(); exe.push_str(if cfg!(windows) { ".exe" } else { "" }); |