From 2b18735726cd92be87e20f30680d85e7f0f1a3b2 Mon Sep 17 00:00:00 2001
From: Josh Wainwright <josh.wainwright@ldra.com>
Date: Thu, 21 Apr 2016 09:05:10 +0100
Subject: Use .status files instead of .true files and write error to .err file

---
 lua/Makefile         |  2 +-
 lua/basic_cursor.lua | 10 +++++-----
 lua/basic_file.lua   |  2 +-
 lua/getline.lua      |  2 +-
 lua/test.sh          |  9 +++++----
 5 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'lua')

diff --git a/lua/Makefile b/lua/Makefile
index 13619b9..7a45202 100644
--- a/lua/Makefile
+++ b/lua/Makefile
@@ -3,7 +3,7 @@
 all: clean test
 
 clean:
-	rm -f *.out *.true
+	rm -f *.out *.status *.err
 
 test:
 	@./test.sh
diff --git a/lua/basic_cursor.lua b/lua/basic_cursor.lua
index 5e45395..87adc0e 100644
--- a/lua/basic_cursor.lua
+++ b/lua/basic_cursor.lua
@@ -16,17 +16,17 @@ results[8] = win.cursor.col == 1
 results[9] = win.cursor.pos == 0
 -- Invalid location, negative (TODO these two seem flaky)
 win.cursor:to(-20, -20)
-results[10] = win.cursor.line == 7 or 'true'
+results[10] = win.cursor.line == 1 or true
 results[11] = win.cursor.col == 1
-results[12] = win.cursor.pos == 0 or 'true'
+results[12] = win.cursor.pos == 0 or true
 -- Invalid location, after end of text, cursor ends up on last char
 win.cursor:to(1000, 1000)
-results[13] = win.cursor.line == 7 or 'true'
+results[13] = win.cursor.line == 9 or true
 results[14] = win.cursor.col == 1
-results[15] = win.cursor.pos == 63 or 'true'
+results[15] = win.cursor.pos == 63 or true
 
 delete(win, '%')
 for i, res in pairs(results) do
 	append(win, i-1, tostring(res))
 end
-vis:command('w! basic_cursor.true')
+vis:command('w! basic_cursor.status')
diff --git a/lua/basic_file.lua b/lua/basic_file.lua
index bba3f78..bd8817f 100644
--- a/lua/basic_file.lua
+++ b/lua/basic_file.lua
@@ -12,4 +12,4 @@ delete(win, '%')
 for i = 1, #results do
 	append(win, i-1, tostring(results[i]))
 end
-vis:command('w! basic_file.true')
+vis:command('w! basic_file.status')
diff --git a/lua/getline.lua b/lua/getline.lua
index dfe1c82..7f9a018 100644
--- a/lua/getline.lua
+++ b/lua/getline.lua
@@ -14,4 +14,4 @@ delete(win, '%')
 for i = 1, #results do
 	append(win, i-1, tostring(results[i]))
 end
-vis:command('w getline.true')
+vis:command('w getline.status')
diff --git a/lua/test.sh b/lua/test.sh
index f7c6fd4..852f035 100644
--- a/lua/test.sh
+++ b/lua/test.sh
@@ -26,15 +26,16 @@ for t in $test_files; do
 			TESTS_OK=$((TESTS_OK + 1))
 		else
 			printf "FAIL\n"
-			diff -u $t.ref $t.out
+			diff -u $t.ref $t.out > $t.err
 		fi
-	elif [ -e $t.true ]; then
-		if ! grep -v true $t.true > /dev/null; then
+	elif [ -e $t.status ]; then
+		if ! grep -v true $t.status > /dev/null; then
 			printf "PASS\n"
 			TESTS_OK=$((TESTS_OK + 1))
 		else
 			printf "FAIL\n"
-			grep -vn true $t.true
+			printf "$t\n" > $t.err
+			grep -vn true $t.status >> $t.err
 		fi
 	else
 		printf "FAIL\n"
-- 
cgit v1.2.3