From 5e8add55fc62db6117f98d56c41715841f194bda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ciro=20Santilli=20=E5=85=AD=E5=9B=9B=E4=BA=8B=E4=BB=B6=20?=
 =?UTF-8?q?=E6=B3=95=E8=BD=AE=E5=8A=9F?= <ciro.santilli@gmail.com>
Date: Tue, 22 Jan 2019 00:00:00 +0000
Subject: [PATCH] test-gdb and test-userland: fix --dry-run missing seconds

---
 common.py     | 12 ++++++++++--
 test-gdb      |  2 +-
 test-userland |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/common.py b/common.py
index d63c008..d5d88c6 100644
--- a/common.py
+++ b/common.py
@@ -770,7 +770,7 @@ Valid emulators: {}
     def log_error(self, msg):
         print('error: {}'.format(msg), file=sys.stdout)
 
-    def log_info(self, msg, flush=False, **kwargs):
+    def log_info(self, msg='', flush=False, **kwargs):
         if not self.env['quiet']:
             print('{}'.format(msg), **kwargs)
         if flush:
@@ -935,11 +935,19 @@ Valid emulators: {}
         test_id_string = '{} {} {}'.format(self.env['emulator'], self.env['arch'], source)
         if self.env['verbose']:
             end = '\n'
-        else:
+        elif not self.env['dry_run']:
             end = ' '
+        else:
+            end = ''
         self.log_info(test_id_string, flush=True, end=end)
         return test_id_string
 
+    def test_teardown(self, run_object):
+        if self.env['dry_run']:
+            self.log_info()
+        else:
+            self.log_info(self.seconds_to_hms(run_object.ellapsed_seconds))
+
     def timed_main(self):
         '''
         Main action of the derived class.
diff --git a/test-gdb b/test-gdb
index 48bf3b7..2b28b93 100755
--- a/test-gdb
+++ b/test-gdb
@@ -53,7 +53,7 @@ found by searching for the Python test files.
                 gdb_args['test'] = True
                 run_gdb(**gdb_args)
                 run_thread.join()
-                self.log_info(self.seconds_to_hms(run.ellapsed_seconds))
+                self.test_teardown(run)
 
 if __name__ == '__main__':
     Main().cli()
diff --git a/test-userland b/test-userland
index 6d4d4bb..cbe80f9 100755
--- a/test-userland
+++ b/test-userland
@@ -51,7 +51,7 @@ If given, run only the given tests. Otherwise, run all tests.
             run_args['background'] = True
             test_id_string = self.test_setup(run_args, source)
             exit_status = run(**run_args)
-            self.log_info(self.seconds_to_hms(run.ellapsed_seconds))
+            self.test_teardown(run)
             if exit_status != 0:
                 self.log_error('test failed, program exit status: {} test id: {}'.format(exit_status, test_id_string))
                 sys.exit(1)