From d45556666e82a1820828672e0d5754612e4042a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= <michael@freepascal.org>
Date: Thu, 15 Feb 2024 14:08:42 +0100
Subject: [PATCH] * Properly handle stdout for redir
---
tests/utils/redir.pp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/utils/redir.pp b/tests/utils/redir.pp
index 5eb27d3f9b..b9186a5836 100644
--- a/tests/utils/redir.pp
+++ b/tests/utils/redir.pp
@@ -810,7 +810,10 @@ begin
P.CommandLine:=Progname + ' ' + ComLine;
P.InputDescriptor.FileName:=RedirStdIn;
P.OutputDescriptor.FileName:=RedirStdOut;
- P.ErrorDescriptor.FileName:=RedirStdErr;
+ if RedirStdErr='stdout' then
+ P.Options:=P.options+[poStdErrToOutput]
+ else
+ P.ErrorDescriptor.FileName:=RedirStdErr;
P.Execute;
Result:=P.WaitOnExit(max_count);
if Result then