diff options
| author | Aram Drevekenin <aram@poor.dev> | 2023-05-16 12:47:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-16 12:47:18 +0200 |
| commit | 5fe4d60c220c872c1e77a7ddf24fec6686c28e95 (patch) | |
| tree | b6abec3006de7cd2eaecee149005d55ee4671a6b /xtask | |
| parent | 4b7d7c34b72e67168a2ec53b27776047ccddf522 (diff) | |
feat(plugins): Plugin workers and strider (#2449)
* mvp of strider fuzzy find
* improve search ui
* various refactoringz
* moar refactoring
* even more refactoring
* tests and more refactoring
* refactor: remove unused stuff
* style(fmt): rustfmt
* debug ci
* debug ci
* correct path for plugin system tests
* fix plugin system ci tests
* remove debugging statements from test
* fix plugin worker persistence
* add test for plugin worker persistence
* style(fmt): rustfmt
* final cleanups
* remove outdated comments
Diffstat (limited to 'xtask')
| -rw-r--r-- | xtask/src/ci.rs | 23 | ||||
| -rw-r--r-- | xtask/src/main.rs | 1 |
2 files changed, 21 insertions, 3 deletions
diff --git a/xtask/src/ci.rs b/xtask/src/ci.rs index e34f517ea..99f195daa 100644 --- a/xtask/src/ci.rs +++ b/xtask/src/ci.rs @@ -4,7 +4,10 @@ use crate::{ flags::{self, CiCmd, Cross, E2e}, }; use anyhow::Context; -use std::{ffi::OsString, path::PathBuf}; +use std::{ + ffi::OsString, + path::{Path, PathBuf}, +}; use xshell::{cmd, Shell}; pub fn main(sh: &Shell, flags: flags::Ci) -> anyhow::Result<()> { @@ -105,13 +108,27 @@ fn e2e_test(sh: &Shell, args: Vec<OsString>) -> anyhow::Result<()> { // set --no-default-features so the test binary gets built with the plugins from assets/plugins that just got built crate::cargo() .and_then(|cargo| { + // e2e tests cmd!( sh, "{cargo} test --no-default-features -- --ignored --nocapture --test-threads 1" ) - .args(args) + .args(args.clone()) .run() - .map_err(anyhow::Error::new) + .map_err(anyhow::Error::new)?; + + // plugin system tests are run here because they're medium-slow + let _pd = sh.push_dir(Path::new("zellij-server")); + println!(""); + let msg = format!(">> Testing Plugin System"); + crate::status(&msg); + println!("{}", msg); + + cmd!(sh, "{cargo} test -- --ignored --nocapture --test-threads 1") + .args(args.clone()) + .run() + .with_context(|| format!("Failed to run tests for the Plugin System"))?; + Ok(()) }) .context(err_context) } diff --git a/xtask/src/main.rs b/xtask/src/main.rs index e394f8431..c6e75118e 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -34,6 +34,7 @@ lazy_static::lazy_static! { WorkspaceMember{crate_name: "default-plugins/status-bar", build: true}, WorkspaceMember{crate_name: "default-plugins/strider", build: true}, WorkspaceMember{crate_name: "default-plugins/tab-bar", build: true}, + WorkspaceMember{crate_name: "default-plugins/fixture-plugin-for-tests", build: true}, WorkspaceMember{crate_name: "zellij-utils", build: false}, WorkspaceMember{crate_name: "zellij-tile-utils", build: false}, WorkspaceMember{crate_name: "zellij-tile", build: false}, |