X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/31d0247cc58abc0b0720aa7e9972011c5a66995c..c81c35dfd10050ffef85d57dc2ad73f52f38a3f2:/test/tests.at

diff --git a/test/tests.at b/test/tests.at
index fbb62bb..4bea513 100644
--- a/test/tests.at
+++ b/test/tests.at
@@ -233,6 +233,7 @@ test_parse([char], [';'], [';' ; = 59 = 0x3b])
 test_parse([char], [';';?], [';' ; = 59 = 0x3b])
 test_parse([char], [';' ;?], [';' ; = 59 = 0x3b])
 test_parse([char], [\"], ['"' ; = 34 = 0x22]) # "
+test_parse([char], [@%:@], ['@%:@' ; = 35 = 0x23])
 test_parse([char], ['@%:@'], ['@%:@' ; = 35 = 0x23])
 
 test_parse([char], [\n], [@%:@newline ; = '\n' = 10 = 0x0a])
@@ -262,8 +263,6 @@ test_parserr([char], ['''],
 	[3], [syntax error: expected character but found `''])
 test_parserr([char], [;],
 	[3], [syntax error: expected character but found `;'])
-test_parserr([char], [@%:@],
-	[3], [unknown character name `@%:@'])
 test_parserr([char], [';],
 	[3], [syntax error: expected `'' but found @%:@eol])
 test_parserr([char], [\],
@@ -282,41 +281,41 @@ test_parserr([char], [\{012],
 AT_CLEANUP
 
 ###--------------------------------------------------------------------------
-AT_SETUP([tvec type-string])
-
-test_parse([string], [foo], [foo])
-test_parse([string], [foo bar], ["foo bar"])
-test_parse([string], [foo  bar], ["foo  bar"])
-test_parse([string], [foo  ""  bar], [foobar])
-test_parse([string], [ foo  bar ], ["foo  bar"])
-test_parse([string], [ foo @&t@
+AT_SETUP([tvec type-text])
+
+test_parse([text], [foo], [foo])
+test_parse([text], [foo bar], ["foo bar"])
+test_parse([text], [foo  bar], ["foo  bar"])
+test_parse([text], [foo  ""  bar], [foobar])
+test_parse([text], [ foo  bar ], ["foo  bar"])
+test_parse([text], [ foo @&t@
 	bar ], ["foo  bar"])
 
-test_parse([string], [foo @%:@nul bar], ["foo\{0}bar"])
+test_parse([text], [foo @%:@nul bar], ["foo\{0}bar"])
 
-test_parse([string], ["f" !repeat 2 { o } "bar"], [foobar])
-test_parse([string], ["{"!repeat 5{"abc"}"}"], ["{abcabcabcabcabc}"])
+test_parse([text], ["f" !repeat 2 { o } "bar"], [foobar])
+test_parse([text], ["{"!repeat 5{"abc"}"}"], ["{abcabcabcabcabc}"])
 
-test_parse([string], [!hex "f" 6f "o"], [foo])
+test_parse([text], [!hex "f" 6f "o"], [foo])
 
-test_parse([string], ["foo\n"], ["foo\n"])
+test_parse([text], ["foo\n"], ["foo\n"])
 
-test_parse([string], [foo\
+test_parse([text], [foo\
 bar], [
 	"foo\n"
 	"bar"])
-test_parse([string], ["foo\
+test_parse([text], ["foo\
 bar"], [foobar])
-test_parse([string], ["foo" @%:@newline "bar" @%:@newline], [
+test_parse([text], ["foo" @%:@newline "bar" @%:@newline], [
 	"foo\n"
 	"bar\n"])
 
-test_parserr([string], [],
+test_parserr([text], [],
 	[4], [syntax error: expected string but found @%:@eof])
-test_parse([string], [""], [""])
-test_parse([string], [''], [""])
+test_parse([text], [""], [""])
+test_parse([text], [''], [""])
 
-test_parse([string], ["f\x{6f}o"], [foo])
+test_parse([text], ["f\x{6f}o"], [foo])
 
 AT_CLEANUP
 
@@ -348,6 +347,8 @@ test_parse([bytes], [!base64 AAAA], [000000 ; ...])
 test_parse([bytes], [!base64 AA], [00 ; .])
 test_parse([bytes], [!base64 AAA], [0000 ; ..])
 
+test_parserr([text], [],
+	[4], [syntax error: expected string but found @%:@eof])
 test_parserr([bytes], [0],
 	[4], [invalid hex sequence end: Excess or nonzero padding bits])
 test_parserr([bytes], [!base64 A],
@@ -420,7 +421,30 @@ z = 1
 check_template([BUILDDIR/t/tvec.t -fh tv], [0],
 [tv:11: `crash' skipped: no connection
 crash: ok (1 skipped)
-PASSED 3 tests (1 skipped) in 1 group
+PASSED ={N:\d+} tests (1 skipped) in 1 group
+])
+
+AT_CLEANUP
+
+###--------------------------------------------------------------------------
+AT_SETUP([tvec timeout])
+
+AT_DATA([tv],
+[;;; -*-conf-*-
+
+@<:@sleep@:>@
+
+time = 0.5
+z = 0
+@progress = %RUN
+@exit = killed | SIGALRM
+
+time = 0.125
+z = 1
+])
+check_template([BUILDDIR/t/tvec.t -fh tv], [0],
+[sleep: ok
+PASSED all ={N:\d+} tests in 1 group
 ])
 
 AT_CLEANUP
@@ -441,7 +465,7 @@ uenum = banana
 fenum = tau
 penum = alice
 flags = red-fg | white-bg | bright
-string = "Hello, world!"
+text = "Hello, world!"
 bytes =
 	2923be84 e16cd6ae 529049f1 f1bbe9eb
 	b3a6db3c 870c3e99 245e0d1c 06b747de