From 1019ed5758d97da4a3376da3af1f38a7b99dc93f Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Fri, 16 Oct 2020 14:12:37 -0400
Subject: [PATCH] Fix to TestDriver.pm (qtest)

---
 qtest/module/TestDriver.pm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/qtest/module/TestDriver.pm b/qtest/module/TestDriver.pm
index 704ad12c..a320a1af 100644
--- a/qtest/module/TestDriver.pm
+++ b/qtest/module/TestDriver.pm
@@ -118,7 +118,13 @@ sub get_tty_features
     eval
     {
 	require Term::ReadKey;
-	($ncols, undef, undef, undef) = Term::ReadKey::GetTerminalSize();
+        if (-t STDOUT)
+        {
+            # This prints error messages if STDOUT is not a tty, so
+            # check even if -stdout-tty=1 was given.
+            ($ncols, undef, undef, undef) =
+                Term::ReadKey::GetTerminalSize(\*STDOUT);
+        }
 	$got_size = 1;
     };
     if (! $got_size)
@@ -145,6 +151,10 @@ sub get_tty_features
 	    }
 	};
     }
+    if (! defined $ncols)
+    {
+        $ncols = 80;
+    }
     eval
     {
 	if ($in_windows)