modify path

Author: mrp089

.github/workflows/test.yml

@@ -130,7 +130,7 @@ jobs:
 
           # run integration tests
           cd (Join-Path $env:GITHUB_WORKSPACE 'tests')
-          python -m pytest -v --durations=0 --ignore=test_dirgraph.py
+          # python -m pytest -v --durations=0 --ignore=test_dirgraph.py
 
           # build interface tests
           cd test_interface
@@ -139,47 +139,59 @@ jobs:
           cmake -G Ninja ..
           cmake --build . --parallel 2
 
-          $test1 = Join-Path $env:GITHUB_WORKSPACE 'tests/test_interface/test_01/svzerod_3Dcoupling.json'
-          $test2 = Join-Path $env:GITHUB_WORKSPACE 'tests/test_interface/test_02/svzerod_tuned.json'
-          
+          $iface = Join-Path $build 'src\interface\libsvzero_interface.dll'
+          if (-not (Test-Path $iface)) { throw "Missing $iface" }
+
+          # Threading knobs to avoid deadlocks
+          $env:OMP_NUM_THREADS='1'
+          $env:OMP_WAIT_POLICY='PASSIVE'
+          $env:KMP_INIT_AT_FORK='FALSE'
+          $env:KMP_WARNINGS='0'
+          $env:KMP_DUPLICATE_LIB_OK='TRUE'
+
+          # Ensure loader can find the interface and any neighbors
+          $env:PATH = "$($build)\src\interface;$env:PATH"
+          if (Test-Path (Join-Path $build 'bin')) { $env:PATH = "$($build)\bin;$env:PATH" }
+
+          # ctypes smoke test (surface missing dependent)
+          python - << 'PY'
+          import ctypes, sys
+          dll = r'''%s'''
+          try:
+              ctypes.CDLL(dll)
+              print("ctypes: loaded OK:", dll)
+          except OSError as e:
+              print("ctypes: FAILED to load:", dll, "->", e)
+              sys.exit(1)
+          PY
+
+          # Paths to JSON test data
           $test1Json = Join-Path $env:GITHUB_WORKSPACE 'tests/test_interface/test_01/svzerod_3Dcoupling.json'
           $test2Json = Join-Path $env:GITHUB_WORKSPACE 'tests/test_interface/test_02/svzerod_tuned.json'
 
-          # Confirm test EXEs exist
-          $test1Exe = Join-Path (Join-Path (Get-Location) 'test_01') 'svZeroD_interface_test01.exe'
-          $test2Exe = Join-Path (Join-Path (Get-Location) 'test_02') 'svZeroD_interface_test02.exe'
-          Write-Host "`n=== Interface test binaries ==="
-          Test-Path $test1Exe | % { "test_01 exe exists: $_" }
-          Test-Path $test2Exe | % { "test_02 exe exists: $_" }
+          cd (Join-Path $env:GITHUB_WORKSPACE 'tests/test_interface/build_tests')
 
-          # Helper to run with timeout + capture logs
           function Run-TestExe {
-            param([string]$exe, [string]$arg1, [string]$arg2, [string]$wd)
-            Push-Location $wd
+            param([string]$dir, [string]$exe, [string]$buildRoot, [string]$json, [string]$name)
+            Push-Location $dir
             Remove-Item -Force -ErrorAction SilentlyContinue out.txt, err.txt
-            $p = Start-Process -FilePath $exe -ArgumentList @("$arg1","$arg2") -NoNewWindow -PassThru `
+            $p = Start-Process -FilePath $exe -ArgumentList @($buildRoot, $json) -NoNewWindow -PassThru `
                  -RedirectStandardOutput out.txt -RedirectStandardError err.txt
             if (-not (Wait-Process -Id $p.Id -Timeout 120 -ErrorAction SilentlyContinue)) {
-              Write-Host "TIMEOUT: killing $exe"
-              Stop-Process -Id $p.Id -Force -ErrorAction SilentlyContinue
-              Get-Content err.txt -ErrorAction SilentlyContinue | Write-Host
-              Get-Content out.txt -ErrorAction SilentlyContinue | Write-Host
-              throw "Timed out running $exe"
+              Write-Host "TIMEOUT in $name"; Get-Content err.txt -ea SilentlyContinue; Get-Content out.txt -ea SilentlyContinue
+              Stop-Process -Id $p.Id -Force -ea SilentlyContinue
+              Pop-Location; throw "Timeout: $name"
             }
-            $exit = $p.ExitCode
-            Pop-Location
-            if ($exit -ne 0) {
-              Write-Host "`n--- stdout ---"; Get-Content (Join-Path $wd 'out.txt') -ErrorAction SilentlyContinue
-              Write-Host "`n--- stderr ---"; Get-Content (Join-Path $wd 'err.txt') -ErrorAction SilentlyContinue
-              throw "$exe exited with code $exit"
+            if ($p.ExitCode -ne 0) {
+              Write-Host "`n--- $name stdout ---"; Get-Content out.txt -ea SilentlyContinue
+              Write-Host "`n--- $name stderr ---"; Get-Content err.txt -ea SilentlyContinue
+              Pop-Location; throw "$name exited with $($p.ExitCode)"
             }
+            Pop-Location
           }
 
-          # Run test_01 from its own dir with hard timeout and logs
-          Run-TestExe -exe $test1Exe -arg1 $build -arg2 $test1Json -wd (Join-Path (Get-Location) 'test_01')
-
-          # Run test_02 likewise
-          Run-TestExe -exe $test2Exe -arg1 $build -arg2 $test2Json -wd (Join-Path (Get-Location) 'test_02')
+          Run-TestExe -dir '.\test_01' -exe 'svZeroD_interface_test01.exe' -buildRoot $build -json $test1Json -name 'test_01'
+          Run-TestExe -dir '.\test_02' -exe 'svZeroD_interface_test02.exe' -buildRoot $build -json $test2Json -name 'test_02'
 
           # build installer
           choco install nsis -y

tests/test_interface/test_02/main.cpp

@@ -63,7 +63,7 @@ int main(int argc, char** argv) {
   LPNSolverInterface interface;
 
   if (argc != 3) {
-    std::runtime_error(
+    throw std::runtime_error(
         "Usage: svZeroD_interface_test01 <path_to_svZeroDSolver_build_folder> "
         "<path_to_json_file>");
   }

tests/test_interface/test_03/main.cpp

@@ -19,7 +19,7 @@ int main(int argc, char** argv) {
   LPNSolverInterface interface;
 
   if (argc != 3) {
-    std::runtime_error(
+    throw std::runtime_error(
         "Usage: svZeroD_interface_test03 <path_to_svzeroDSolver_build_folder> "
         "<path_to_json_file>");
   }