Fix deadlock risks in RunProgram/Runner; add const for ActiveHDL dir; fix VivadoSimulator comment

Co-authored-by: Malcolmnixon <1863707+Malcolmnixon@users.noreply.github.com>

Author: Copilot

src/DEMAConsulting.VHDLTest/Run/RunProgram.cs

@@ -59,10 +59,14 @@ public static int Run(
         using var p = new Process { StartInfo = startInfo };
         p.Start();
 
-        // Collect all output
-        output = p.StandardOutput.ReadToEnd() + p.StandardError.ReadToEnd();
+        // Read both streams asynchronously to prevent deadlock if either buffer fills
+        var stdoutTask = p.StandardOutput.ReadToEndAsync();
+        var stderrTask = p.StandardError.ReadToEndAsync();
         p.WaitForExit();
 
+        // Collect all output
+        output = stdoutTask.GetAwaiter().GetResult() + stderrTask.GetAwaiter().GetResult();
+
         // Return the output
         return p.ExitCode;
     }

src/DEMAConsulting.VHDLTest/Simulators/ActiveHdlSimulator.cs

@@ -34,6 +34,11 @@ public sealed class ActiveHdlSimulator : Simulator
     /// </summary>
     private const string SimApp = "vsimsa";
 
+    /// <summary>
+    /// Library output directory path (relative to working directory)
+    /// </summary>
+    private const string LibDirPath = "VHDLTest.out/ActiveHDL";
+
     /// <summary>
     /// Compile processor
     /// </summary>
@@ -88,7 +93,7 @@ public override RunResults Compile(Context context, Options options)
         context.WriteVerboseLine($"  Simulator Path: {simPath}");
 
         // Create the library directory
-        var libDir = Path.Combine(options.WorkingDirectory, "VHDLTest.out/ActiveHDL");
+        var libDir = Path.Combine(options.WorkingDirectory, LibDirPath);
         context.WriteVerboseLine($"  Library Directory: {libDir}");
         if (!Directory.Exists(libDir))
         {
@@ -98,7 +103,7 @@ public override RunResults Compile(Context context, Options options)
         // Build the batch file
         var writer = new StringBuilder();
         writer.AppendLine("onerror {exit -code 1}");
-        writer.AppendLine("alib work VHDLTest.out/ActiveHDL");
+        writer.AppendLine($"alib work {LibDirPath}");
         writer.AppendLine("set worklib work");
         foreach (var file in options.Config.Files)
         {
@@ -113,12 +118,12 @@ public override RunResults Compile(Context context, Options options)
         // Run the ActiveHDL compiler
         var application = Path.Combine(simPath, SimApp);
         context.WriteVerboseLine($"  Run Directory: {options.WorkingDirectory}");
-        context.WriteVerboseLine($"  Run Command: {application} -do VHDLTest.out/ActiveHDL/compile.do");
+        context.WriteVerboseLine($"  Run Command: {application} -do {LibDirPath}/compile.do");
         return CompileProcessor.Execute(
             application,
             options.WorkingDirectory,
             "-do",
-            "VHDLTest.out/ActiveHDL/compile.do");
+            $"{LibDirPath}/compile.do");
     }
 
     /// <inheritdoc />
@@ -133,7 +138,7 @@ public override TestResult Test(Context context, Options options, string test)
         context.WriteVerboseLine($"  Simulator Path: {simPath}");
 
         // Get the library directory
-        var libDir = Path.Combine(options.WorkingDirectory, "VHDLTest.out/ActiveHDL");
+        var libDir = Path.Combine(options.WorkingDirectory, LibDirPath);
         context.WriteVerboseLine($"  Library Directory: {libDir}");
 
         // Build the batch file
@@ -153,12 +158,12 @@ public override TestResult Test(Context context, Options options, string test)
         // Run the test
         var application = Path.Combine(simPath, SimApp);
         context.WriteVerboseLine($"  Run Directory: {options.WorkingDirectory}");
-        context.WriteVerboseLine($"  Run Command: {application} -do VHDLTest.out/ActiveHDL/test.do");
+        context.WriteVerboseLine($"  Run Command: {application} -do {LibDirPath}/test.do");
         var testRunResults = TestProcessor.Execute(
             Path.Combine(simPath, SimApp),
             options.WorkingDirectory,
             "-do",
-            "VHDLTest.out/ActiveHDL/test.do");
+            $"{LibDirPath}/test.do");
 
         // Return the test results
         return new TestResult(

src/DEMAConsulting.VHDLTest/Simulators/VivadoSimulator.cs

@@ -96,7 +96,7 @@ public override RunResults Compile(Context context, Options options)
         context.WriteVerboseLine($"  Script File: {script}");
         File.WriteAllText(script, writer.ToString());
 
-        // Run the ModelSim compiler
+        // Run the Vivado compiler
         var application = Path.Combine(simPath, "xvhdl");
         context.WriteVerboseLine($"  Run Directory: {libDir}");
         context.WriteVerboseLine($"  Run Command: cmd /c {application} -file compile.do");

test/DEMAConsulting.VHDLTest.Tests/Runner.cs

@@ -56,11 +56,15 @@ public static int Run(out string output, string program, params string[] argumen
         var process = Process.Start(startInfo) ??
                       throw new InvalidOperationException("Failed to start process");
 
+        // Read both streams asynchronously to prevent deadlock if either buffer fills
+        var stdoutTask = process.StandardOutput.ReadToEndAsync();
+        var stderrTask = process.StandardError.ReadToEndAsync();
+
         // Wait for the process to exit
         process.WaitForExit();
 
         // Save the output and return the exit code
-        output = process.StandardOutput.ReadToEnd();
+        output = stdoutTask.GetAwaiter().GetResult() + stderrTask.GetAwaiter().GetResult();
         return process.ExitCode;
     }
 }