From dd0a97541c0647ab8cc5de8a434bd4047f485448 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Thu, 20 May 2021 10:03:53 +0300
Subject: [PATCH] tests: use term.header_left, and a more compact output layout

---
 cmd/tools/modules/testing/common.v |  4 ++--
 cmd/tools/vtest-all.v              | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cmd/tools/modules/testing/common.v b/cmd/tools/modules/testing/common.v
index 4199ab70a3..10c1612f9e 100644
--- a/cmd/tools/modules/testing/common.v
+++ b/cmd/tools/modules/testing/common.v
@@ -441,11 +441,11 @@ pub fn building_any_v_binaries_failed() bool {
 }
 
 pub fn eheader(msg string) {
-	eprintln(term.header(msg, '-'))
+	eprintln(term.header_left(msg, '-'))
 }
 
 pub fn header(msg string) {
-	println(term.header(msg, '-'))
+	println(term.header_left(msg, '-'))
 }
 
 pub fn setup_new_vtmp_folder() string {
diff --git a/cmd/tools/vtest-all.v b/cmd/tools/vtest-all.v
index 628b4efb1a..6977cbd566 100644
--- a/cmd/tools/vtest-all.v
+++ b/cmd/tools/vtest-all.v
@@ -22,9 +22,8 @@ fn main() {
 	oks := commands.filter(it.ecode == 0)
 	fails := commands.filter(it.ecode != 0)
 	println('')
-	println(term.header(term.colorize(term.yellow, term.colorize(term.bold, 'Summary of `v test-all`:')),
-		'-'))
-	println(term.colorize(term.yellow, 'Total runtime: $spent ms'))
+	println(term.header_left(term_highlight('Summary of `v test-all`:'), '-'))
+	println(term_highlight('Total runtime: $spent ms'))
 	for ocmd in oks {
 		msg := if ocmd.okmsg != '' { ocmd.okmsg } else { ocmd.line }
 		println(term.colorize(term.green, '>          OK: $msg '))
@@ -124,11 +123,14 @@ fn (mut cmd Command) run() {
 	// vlib/v/tests/local_test.v and vlib/v/tests/repl/repl_test.v
 	os.chdir(vroot)
 	if cmd.label != '' {
-		println(term.header(cmd.label, '*'))
+		println(term.header_left(cmd.label, '*'))
 	}
 	sw := time.new_stopwatch({})
 	cmd.ecode = os.system(cmd.line)
 	spent := sw.elapsed().milliseconds()
-	println(term.colorize(term.yellow, '> Running: "$cmd.line" took: $spent ms.'))
-	println('')
+	println(term_highlight('> Running: "$cmd.line" took: $spent ms.'))
+}
+
+fn term_highlight(s string) string {
+	return term.colorize(term.yellow, term.colorize(term.bold, s))
 }