Improve diagnostics-only flow and smoke test robustness

Author: Erotemic

dev/_installers/build_installer.ps1

@@ -8,7 +8,8 @@ param(
     [switch]$NoClean,
     [switch]$SkipPyInstaller,
     [switch]$SkipInno,
-    [switch]$SmokeTest
+    [switch]$SmokeTest,
+    [switch]$DiagnosticsOnly
 )
 
 Set-StrictMode -Version Latest
@@ -74,6 +75,12 @@ try {
     Write-Host "DiagDir       = $DiagDir"
     Write-Host "PSVersion     = $($PSVersionTable.PSVersion)"
 
+    if ($DiagnosticsOnly) {
+        $SkipPyInstaller = $true
+        $SkipInno = $true
+        Write-Host "DiagnosticsOnly enabled -> forcing -SkipPyInstaller and -SkipInno"
+    }
+
     $VenvPy = Ensure-Venv -RepoRootPath $RepoRoot
 
     Write-Section "Python / pip sanity"
@@ -173,24 +180,42 @@ try {
 
     if ($SmokeTest) {
         Write-Section "Smoke test (IBEIS-console.exe with IBEIS_DLL_DEBUG=1) -> smoke_test.txt"
-        $SmokeOut = Join-Path $DiagDir "smoke_test.txt"
+        $SmokeOut = Join-Path $DiagDir "smoke_test_stdout.txt"
+        $SmokeErr = Join-Path $DiagDir "smoke_test_stderr.txt"
+        $SmokeMerged = Join-Path $DiagDir "smoke_test.txt"
         $exe = Join-Path $AppDir "IBEIS-console.exe"
 
         $env:IBEIS_DLL_DEBUG = "1"
-        $p = Start-Process -FilePath $exe -WorkingDirectory $AppDir -NoNewWindow -PassThru `
-            -RedirectStandardOutput $SmokeOut -RedirectStandardError $SmokeOut
-
         try {
+            $p = Start-Process -FilePath $exe -WorkingDirectory $AppDir -NoNewWindow -PassThru `
+                -RedirectStandardOutput $SmokeOut -RedirectStandardError $SmokeErr
+
             Wait-Process -Id $p.Id -Timeout 20 -ErrorAction SilentlyContinue | Out-Null
             if (-not $p.HasExited) {
                 Write-Warning "Smoke test timed out; stopping process."
                 Stop-Process -Id $p.Id -Force -ErrorAction SilentlyContinue
             }
+        } catch {
+            Write-Warning "Smoke test failed to start: $($_.Exception.Message)"
         } finally {
             Remove-Item Env:\IBEIS_DLL_DEBUG -ErrorAction SilentlyContinue
         }
 
-        Write-Host "Wrote: $SmokeOut"
+        $parts = @()
+        if (Test-Path $SmokeOut) {
+            $parts += "===== STDOUT ====="
+            $parts += (Get-Content $SmokeOut)
+        }
+        if (Test-Path $SmokeErr) {
+            $parts += "===== STDERR ====="
+            $parts += (Get-Content $SmokeErr)
+        }
+        if ($parts.Count -gt 0) {
+            $parts | Set-Content -Path $SmokeMerged
+            Write-Host "Wrote: $SmokeMerged"
+        } else {
+            Write-Warning "Smoke test produced no output files."
+        }
     }
 
     if (-not $SkipInno) {

dev/_installers/ibeis_pyi_helper.py

@@ -131,6 +131,12 @@ def _collect_msvc_runtime_binaries() -> List[BinaryTuple]:
     return out
 
 
+
+
+def _exclude_test_modules(mods: List[str]) -> List[str]:
+    return [m for m in mods if ".tests" not in m and not m.endswith(".test") and ".testing" not in m]
+
+
 def collect_everything():
     datas: List[DataTuple] = []
     binaries: List[BinaryTuple] = []
@@ -144,12 +150,12 @@ def collect_everything():
     )
 
     # Dynamic imports in ibeis
-    hiddenimports += _all_py_modules_in_package("ibeis")
+    hiddenimports += _exclude_test_modules(_all_py_modules_in_package("ibeis"))
 
     # Custom binary packages
     for pkg in ["pyhesaff", "pyflann_ibeis", "vtool_ibeis_ext"]:
         binaries += _collect_pkg_binaries(pkg)
-        hiddenimports += _all_py_modules_in_package(pkg)
+        hiddenimports += _exclude_test_modules(_all_py_modules_in_package(pkg))
 
     # Wheel binary bundles
     for pkg in ["numpy", "scipy", "pandas", "shapely", "sklearn"]:
@@ -168,7 +174,7 @@ def collect_everything():
     if win32_dir is not None:
         datas += _collect_dir_as_datas(win32_dir, "win32ctypes")
         binaries += _collect_dir_as_binaries(win32_dir, "win32ctypes")
-        hiddenimports += _all_py_modules_in_package("win32ctypes")
+        hiddenimports += _exclude_test_modules(_all_py_modules_in_package("win32ctypes"))
     else:
         hiddenimports += [
             "win32ctypes.core",