From 42f5b79f74c8d667681860c8d009e5406c702454 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@lysator.liu.se>
Date: Mon, 12 Jul 2010 02:18:27 +0200
Subject: [PATCH] Improved logging for -v when not logging to a tty.
---
.../Tools.pmod/Standalone.pmod/test_pike.pike | 5 ++-
lib/modules/Tools.pmod/Testsuite.pmod | 45 ++++++++++---------
2 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike b/lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike
index d0dc4ae540..48d11ba693 100755
--- a/lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike
+++ b/lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike
@@ -535,6 +535,9 @@ int main(int argc, array(string) argv)
// For easy access in spawned test scripts.
putenv ("TEST_VERBOSITY", (string) verbose);
+ putenv ("TEST_ON_TTY", (string) (maybe_tty && Stdio.Terminfo.is_tty()));
+
+ Tools.Testsuite.log_start (verbose, maybe_tty && Stdio.Terminfo.is_tty());
if (watchdog_pid) {
#if defined(__NT__) && !constant(thread_create)
@@ -546,8 +549,6 @@ int main(int argc, array(string) argv)
#endif
}
- Tools.Testsuite.log_start (verbose);
-
// FIXME: Make this code more robust!
args=args[..<argc];
if (sizeof(args) && args[-1] == "-x") {
diff --git a/lib/modules/Tools.pmod/Testsuite.pmod b/lib/modules/Tools.pmod/Testsuite.pmod
index bdc62301bb..6eddb62814 100644
--- a/lib/modules/Tools.pmod/Testsuite.pmod
+++ b/lib/modules/Tools.pmod/Testsuite.pmod
@@ -18,6 +18,7 @@ array(int) run_script (string|array(string) pike_script)
}
protected int verbosity = lambda () {return (int) getenv()->TEST_VERBOSITY;}();
+protected int on_tty = lambda () {return (int) getenv()->TEST_ON_TTY;}();
protected string last_log;
// The last message passed to log_msg if verbosity == 0.
@@ -31,9 +32,10 @@ protected int last_line_inplace = lambda () {return verbosity == 1;}();
// the main testsuite typically logs an "in place" message just before
// spawning the subtest.
-void log_start (int verbosity)
+void log_start (int verbosity, int on_tty)
{
this_program::verbosity = verbosity;
+ this_program::on_tty = on_tty;
last_line_inplace = 0;
}
@@ -55,6 +57,12 @@ void log_msg (string msg, mixed... args)
last_line_length = 0;
}
+ if (last_log) {
+ if (!has_suffix (last_log, "\n")) last_log += "\n";
+ write (last_log);
+ last_log = 0;
+ }
+
log_msg_cont (msg);
}
@@ -71,22 +79,9 @@ void log_msg_cont (string msg, mixed... args)
last_line_length = 0;
}
- switch (verbosity) {
- case 0:
- if (last_log) {
- if (!has_suffix (last_log, "\n")) last_log += "\n";
- write (last_log);
- last_log = 0;
- last_line_length = 0;
- }
- break;
-
- case 1:
- twiddler_counter = -1;
- break;
- }
-
+ last_log = 0;
write (msg);
+ twiddler_counter = -1;
last_line_inplace = 0;
if (has_suffix (msg, "\n") || has_suffix (msg, "\r"))
@@ -133,12 +128,18 @@ void log_status (string msg, mixed... args)
return;
case 1:
- if (last_line_length) {
- if (last_line_inplace)
- write ("\r%*s\r", max (last_line_length, 40), "");
- else
- write ("\n");
+ if (!on_tty) {
+ // Logging to a file or something, so our \r stunts won't look
+ // good. Let's store it like for verbosity == 0; if the user
+ // wants to log all these then (s)he should use verbosity > 1.
+ last_log = (msg != "" && msg);
+ return;
}
+
+ if (last_line_inplace)
+ write ("\r%*s\r", max (last_line_length, 40), "");
+ else if (last_line_length)
+ write ("\n");
twiddler_counter = -1;
write (msg);
last_line_inplace = 1;
@@ -167,7 +168,7 @@ void log_twiddler()
//! of an "in place" message written by @[log_status] on verbosity
//! level 1.
{
- if (verbosity != 1 || last_line_length) return;
+ if (verbosity != 1 || !last_line_length || !on_tty) return;
if (twiddler_counter == -1) {
write (" ");
last_line_length += 2;
--
GitLab