Skip to content

SOLVING TODO: determine if this is necessary or not, since this breaks rm o… #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Anda275 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

SOLVING TODO: determine if this is necessary or not, since this breaks rm o… #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afc6fcc
TODO: determine if this is necessary or not, since this breaks `rm` o…
Anda275 Jan 9, 2024
583c235
TODO: consider adding custom plugin path for tests to not interfere w…
Anda275 Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions crates/nu-test-support/src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ macro_rules! nu {
// For all other options, we call `.into()` on the `$value` and hope for the best. ;)
(
@options [ $($options:tt)* ]
$field:ident : $value:expr,
custom_plugin_path: $value:expr,
Copy link

@alexandruradovici alexandruradovici Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this?

$($rest:tt)*
) => {
nu!(@options [ $($options)* $field => $value.into() ; ] $($rest)*)
nu!(@options [ $($options)* custom_plugin_path => $value.into() ; ] $($rest)*)
};

// When the `$field: $value,` pairs are all parsed, the next tokens are the `$path` and any
Expand Down Expand Up @@ -223,6 +223,7 @@ use tempfile::tempdir;
pub struct NuOpts {
pub cwd: Option<String>,
pub locale: Option<String>,
pub custom_plugin_path: Option<String>, //for custom plugin path
}

pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> Outcome {
Expand Down Expand Up @@ -282,7 +283,7 @@ pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> O
Outcome::new(out, err.into_owned(), output.status)
}

pub fn nu_with_plugin_run_test(cwd: impl AsRef<Path>, plugins: &[&str], command: &str) -> Outcome {
pub fn nu_with_plugin_run_test(cwd: impl AsRef<Path>, opts: NuOpts,plugins: &[&str], command: &str) -> Outcome {
let test_bins = crate::fs::binaries();
let test_bins = nu_path::canonicalize_with(&test_bins, ".").unwrap_or_else(|e| {
panic!(
Expand All @@ -297,6 +298,7 @@ pub fn nu_with_plugin_run_test(cwd: impl AsRef<Path>, plugins: &[&str], command:
std::fs::File::create(&temp_plugin_file).expect("couldn't create temporary plugin file");

crate::commands::ensure_plugins_built();
use crate::fs::executable_path;

let registrations: String = plugins
.iter()
Expand All @@ -309,6 +311,11 @@ pub fn nu_with_plugin_run_test(cwd: impl AsRef<Path>, plugins: &[&str], command:
output
});
let commands = format!("{registrations}{command}");
//solving TODO
let mut command = Command::new(executable_path());
if let Some(plugin_path) = opts.custom_plugin_path {
command.env("NU_PLUGIN_PATH", plugin_path);
}

let target_cwd = crate::fs::in_directory(&cwd);
// In plugin testing, we need to use installed nushell to drive
Expand Down
3 changes: 3 additions & 0 deletions src/terminal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ pub(crate) fn acquire_terminal(interactive: bool) {
// TODO: determine if this is necessary or not, since this breaks `rm` on macOS
// signal(Signal::SIGCHLD, SigHandler::SigIgn).expect("signal ignore");

#[cfg(not(target_os = "macos"))]
signal(Signal::SIGCHLD, SigHandler::SigIgn).expect("signal ignore");

signal_hook::low_level::register(signal_hook::consts::SIGTERM, || {
// Safety: can only call async-signal-safe functions here
// restore_terminal, signal, and raise are all async-signal-safe
Expand Down