Merge remote-tracking branch 'origin/topic/timw/fix-windows-shell-lookup'

* origin/topic/timw/fix-windows-shell-lookup:
  Enforce using the right bash.exe on Windows

Author: timwoj

CHANGES

@@ -1,3 +1,7 @@
+1.2-2 | 2025-01-21 09:08:38 -0700
+
+  * Enforce using the right bash.exe on Windows (Tim Wojtulewicz)
+
 1.2 | 2024-12-10 14:36:06 -0700
 
   * Fix formatting of output when threading (Tim Wojtulewicz, Corelight)

README

@@ -2,7 +2,7 @@
 ..
 .. Version number is filled in automatically.
 
-.. |version| replace:: 1.2
+.. |version| replace:: 1.2-2
 
 ==================================================
 BTest - A Generic Driver for Powerful System Tests

VERSION

@@ -1 +1 @@
-1.2
+1.2-2

btest

@@ -56,7 +56,7 @@ else:
     import multiprocessing.managers as mp_managers
     import multiprocessing.sharedctypes as mp_sharedctypes
 
-VERSION = "1.2"  # Automatically filled in.
+VERSION = "1.2-2"  # Automatically filled in.
 
 Name = "btest"
 Config = None
@@ -228,7 +228,10 @@ def _build_win_subprocess_cmd_script(cmd, tmpdir=None):
     tf.write(fcontents)
     tf.flush()
 
-    bash_cmd = ["bash.exe", "-c", normalize_path(tf.name)]
+    # If you have Windows 11 and WSL2, it defaults to calling "Microsoft Bash Launcher"
+    # even if gitbash is in your path first. Who knows why. Using shutil.which here
+    # forces it to call the right thing.
+    bash_cmd = [shutil.which("bash.exe"), "-c", normalize_path(tf.name)]
     return tf, bash_cmd
 
 

setup.py

@@ -5,6 +5,6 @@
 py_modules = ["btest-sphinx"]
 
 setup(
-    version="1.2",  # Filled in automatically.
+    version="1.2.dev2",  # Filled in automatically.
     py_modules=py_modules,
 )