Enable hook tests for windows

Author: aljazerzen

Cargo.lock

@@ -13,8 +13,8 @@ use std::time::{Duration, SystemTime};
 use anyhow::Context;
 use const_format::formatcp;
 use fn_error_context::context;
-use gel_tokio::InstanceName;
 use gel_tokio::dsn::CredentialsFile;
+use gel_tokio::InstanceName;
 use url::Url;
 
 use crate::async_util;
@@ -33,13 +33,13 @@ use crate::portable::instance::control;
 use crate::portable::instance::create;
 use crate::portable::instance::destroy;
 use crate::portable::instance::status;
-use crate::portable::local::{InstanceInfo, NonLocalInstance, Paths, write_json};
+use crate::portable::local::{write_json, InstanceInfo, NonLocalInstance, Paths};
 use crate::portable::options;
 use crate::portable::project;
-use crate::portable::repository::{self, PackageHash, PackageInfo, download};
+use crate::portable::repository::{self, download, PackageHash, PackageInfo};
 use crate::portable::server;
 use crate::portable::ver;
-use crate::print::{self, Highlight, msg};
+use crate::print::{self, msg, Highlight};
 use crate::process;
 
 use super::extension;
@@ -103,21 +103,6 @@ impl Wsl {
         pro.no_proxy();
         pro
     }
-    pub fn sh(&self, _current_dir: &Path) -> process::Native {
-        let mut pro = process::Native::new("sh", "sh", "wsl");
-        pro.arg("--user").arg("edgedb");
-        pro.arg("--distribution").arg(&self.distribution);
-        pro.arg("_EDGEDB_FROM_WINDOWS=1");
-        if let Some(log_env) = env::var_os("RUST_LOG") {
-            let mut pair = OsString::with_capacity("RUST_LOG=".len() + log_env.len());
-            pair.push("RUST_LOG=");
-            pair.push(log_env);
-            pro.arg(pair);
-        }
-        // TODO: set current dir
-        pro.arg("/bin/sh");
-        pro
-    }
     #[cfg(windows)]
     #[allow(dead_code)]
     fn copy_out(&self, src: impl AsRef<str>, destination: impl AsRef<Path>) -> anyhow::Result<()> {

src/portable/windows.rs

@@ -2,7 +2,6 @@ use std::path;
 use std::sync::Arc;
 use tokio::sync::mpsc::UnboundedReceiver;
 
-use crate::portable::windows;
 use crate::print;
 use crate::process;
 
@@ -43,19 +42,20 @@ pub async fn run_script(
     script: &str,
     current_dir: &path::Path,
 ) -> Result<std::process::ExitStatus, anyhow::Error> {
+    let marker = marker.to_string();
+
     let status = if !cfg!(windows) {
-        let marker = marker.to_string();
         process::Native::new("", marker, "/bin/sh")
             .arg("-c")
             .arg(script)
             .current_dir(current_dir)
             .run_for_status()
             .await?
     } else {
-        let wsl = windows::try_get_wsl()?;
-        wsl.sh(current_dir)
-            .arg("-c")
+        process::Native::new("", marker, "cmd.exe")
+            .arg("/c")
             .arg(script)
+            .current_dir(current_dir)
             .run_for_status()
             .await?
     };

src/watch/scripts.rs

@@ -239,7 +239,6 @@ fn project_link_and_init() {
 }
 
 #[test]
-#[cfg(not(target_os = "windows"))]
 fn hooks() {
     use std::{fs, path};