diff options
author | Bert Belder <bertbelder@gmail.com> | 2020-05-11 20:20:14 +0200 |
---|---|---|
committer | Bert Belder <bertbelder@gmail.com> | 2020-05-11 22:39:13 +0200 |
commit | 3cccadcf0fbfc7ff4e7dd37299a65bea1cf0eab0 (patch) | |
tree | 58c198d0222b942b8bd1321e1423eaaebd909795 /test_plugin/tests/integration_tests.rs | |
parent | a3f82c3d5ec3caad1d4ec74f49ef11adc45807d6 (diff) |
Change plugin interface to prevent segfaults when unloading plugin (#5210)
Fixes: #3473
Closes: #5193
Diffstat (limited to 'test_plugin/tests/integration_tests.rs')
-rw-r--r-- | test_plugin/tests/integration_tests.rs | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/test_plugin/tests/integration_tests.rs b/test_plugin/tests/integration_tests.rs index 2f61ec9aa..17002fc01 100644 --- a/test_plugin/tests/integration_tests.rs +++ b/test_plugin/tests/integration_tests.rs @@ -1,13 +1,26 @@ // To run this test manually: // cd test_plugin -// ../target/debug/deno --allow-plugin tests/test.js debug +// ../target/debug/deno run --unstable --allow-plugin tests/test.js debug -// TODO(ry) Re-enable this test on windows. It is flaky for an unknown reason. -#![cfg(not(windows))] - -use deno::test_util::*; +use std::path::PathBuf; use std::process::Command; +fn target_dir() -> PathBuf { + let current_exe = std::env::current_exe().unwrap(); + let target_dir = current_exe.parent().unwrap().parent().unwrap(); + println!("target_dir {}", target_dir.display()); + target_dir.into() +} + +fn deno_exe_path() -> PathBuf { + // Something like /Users/rld/src/deno/target/debug/deps/deno + let mut p = target_dir().join("deno"); + if cfg!(windows) { + p.set_extension("exe"); + } + p +} + fn deno_cmd() -> Command { assert!(deno_exe_path().exists()); Command::new(deno_exe_path()) |