From 0067c7400143bae967407c4ac4f5960da7561788 Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
Date: Tue, 15 May 2012 15:53:09 +0100
Subject: Clean up test output in the good case

---
 Makefile                    | 4 ++--
 test/test-lace.builtin.lua  | 4 ++--
 test/test-lace.compiler.lua | 4 ++--
 test/test-lace.engine.lua   | 4 ++--
 test/test-lace.lex.lua      | 4 ++--
 test/test-lace.lua          | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 2d5fad4..5d9aa41 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 all: test
 
-TEST_MODULES := lace lace.lex lace.compiler
+TEST_MODULES := lace lace.lex lace.compiler lace.builtin lace.engine
 
 LUA := LUA_PATH="$(shell pwd)/lib/?.lua;$(shell pwd)/extras/luacov/src/?.lua;;" lua5.1
 
@@ -15,7 +15,7 @@ test:
 	@$(RM) luacov.stats.out
 	@ERR=0; \
 	for MOD in $(sort $(TEST_MODULES)); do \
-		echo "$${MOD}:"; \
+		echo -n "$${MOD}: "; \
 		$(LUA) test/test-$${MOD}.lua; \
 		test "x$$?" = "x0" || ERR=1; \
 	done; \
diff --git a/test/test-lace.builtin.lua b/test/test-lace.builtin.lua
index 59d36cb..8df9af8 100644
--- a/test/test-lace.builtin.lua
+++ b/test/test-lace.builtin.lua
@@ -489,7 +489,7 @@ end
 
 local count_ok = 0
 for _, testname in ipairs(testnames) do
-   print("Run: " .. testname)
+--   print("Run: " .. testname)
    local ok, err = xpcall(suite[testname], debug.traceback)
    if not ok then
       print(err)
@@ -499,6 +499,6 @@ for _, testname in ipairs(testnames) do
    end
 end
 
-print("Builtin: " .. tostring(count_ok) .. "/" .. tostring(#testnames) .. " OK")
+print(tostring(count_ok) .. "/" .. tostring(#testnames) .. " OK")
 
 os.exit(count_ok == #testnames and 0 or 1)
diff --git a/test/test-lace.compiler.lua b/test/test-lace.compiler.lua
index 2de62eb..bebeae4 100644
--- a/test/test-lace.compiler.lua
+++ b/test/test-lace.compiler.lua
@@ -182,7 +182,7 @@ end
 
 local count_ok = 0
 for _, testname in ipairs(testnames) do
-   print("Run: " .. testname)
+--   print("Run: " .. testname)
    local ok, err = xpcall(suite[testname], debug.traceback)
    if not ok then
       print(err)
@@ -192,6 +192,6 @@ for _, testname in ipairs(testnames) do
    end
 end
 
-print("Compiler: " .. tostring(count_ok) .. "/" .. tostring(#testnames) .. " OK")
+print(tostring(count_ok) .. "/" .. tostring(#testnames) .. " OK")
 
 os.exit(count_ok == #testnames and 0 or 1)
diff --git a/test/test-lace.engine.lua b/test/test-lace.engine.lua
index 750bf06..df8687a 100644
--- a/test/test-lace.engine.lua
+++ b/test/test-lace.engine.lua
@@ -180,7 +180,7 @@ end
 
 local count_ok = 0
 for _, testname in ipairs(testnames) do
-   print("Run: " .. testname)
+--   print("Run: " .. testname)
    local ok, err = xpcall(suite[testname], debug.traceback)
    if not ok then
       print(err)
@@ -190,6 +190,6 @@ for _, testname in ipairs(testnames) do
    end
 end
 
-print("Engine: " .. tostring(count_ok) .. "/" .. tostring(#testnames) .. " OK")
+print(tostring(count_ok) .. "/" .. tostring(#testnames) .. " OK")
 
 os.exit(count_ok == #testnames and 0 or 1)
diff --git a/test/test-lace.lex.lua b/test/test-lace.lex.lua
index 41f1685..543309a 100644
--- a/test/test-lace.lex.lua
+++ b/test/test-lace.lex.lua
@@ -262,7 +262,7 @@ end
 
 local count_ok = 0
 for _, testname in ipairs(testnames) do
-   print("Run: " .. testname)
+--   print("Run: " .. testname)
    local ok, err = xpcall(suite[testname], debug.traceback)
    if not ok then
       print(err)
@@ -272,6 +272,6 @@ for _, testname in ipairs(testnames) do
    end
 end
 
-print("Lex: " .. tostring(count_ok) .. "/" .. tostring(#testnames) .. " OK")
+print(tostring(count_ok) .. "/" .. tostring(#testnames) .. " OK")
 
 os.exit(count_ok == #testnames and 0 or 1)
diff --git a/test/test-lace.lua b/test/test-lace.lua
index eb65864..d8bdb0d 100644
--- a/test/test-lace.lua
+++ b/test/test-lace.lua
@@ -44,7 +44,7 @@ end
 
 local count_ok = 0
 for _, testname in ipairs(testnames) do
-   print("Run: " .. testname)
+--   print("Run: " .. testname)
    local ok, err = xpcall(suite[testname], debug.traceback)
    if not ok then
       print(err)
@@ -54,6 +54,6 @@ for _, testname in ipairs(testnames) do
    end
 end
 
-print("Lace: " .. tostring(count_ok) .. "/" .. tostring(#testnames) .. " OK")
+print(tostring(count_ok) .. "/" .. tostring(#testnames) .. " OK")
 
 os.exit(count_ok == #testnames and 0 or 1)
-- 
cgit v1.2.1