sync regress with -current

7 files changed, 40 insertions, 34 deletions

diff --git a/regress/Makefile b/regress/Makefile
new file mode 100644
index 0000000..94c29fc
--- /dev/null
+++ b/regress/Makefile
@@ -0,0 +1,5 @@
+#	$OpenBSD: Makefile,v 1.1 2015/06/23 18:03:09 semarie Exp $
+
+SUBDIR += patterns
+
+.include <bsd.subdir.mk>
diff --git a/regress/patterns/Makefile b/regress/patterns/Makefile
index 995b416..d45373e 100644
--- a/regress/patterns/Makefile
+++ b/regress/patterns/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD$
+#	$OpenBSD: Makefile,v 1.2 2015/06/23 19:33:06 reyk Exp $
 
 HTTPDSRC =	${.CURDIR}/../../httpd
 
@@ -25,7 +25,8 @@ test-patterns: patterns-tester test-patterns.out test-patterns.in
 test-patterns-lua: patterns-tester.lua test-patterns-lua.out test-patterns.in
 	cat ${.CURDIR}/test-patterns.in | grep -v '^#' |			\
 	while IFS='	' read string pattern comments ; do 			\
-		${LUA} ./patterns-tester.lua "$${string}" "$${pattern}" 2>&1 || true;	\
-	done | diff -I 'OpenBSD' -u ${.CURDIR}/test-patterns-lua.out -
+		${LUA} ${.CURDIR}/patterns-tester.lua "$${string}" "$${pattern}" 2>&1 || true;	\
+	done | sed "s/.*\/patterns\-tester\.lua/X_PATTERNS_TESTER_X/g" | \
+	diff -I 'OpenBSD' -u ${.CURDIR}/test-patterns-lua.out -
 
 .include <bsd.regress.mk>
diff --git a/regress/patterns/patterns-tester.c b/regress/patterns/patterns-tester.c
index 9134c0c..54f1456 100644
--- a/regress/patterns/patterns-tester.c
+++ b/regress/patterns/patterns-tester.c
@@ -1,6 +1,6 @@
-/* $OpenBSD$ */
+/* $OpenBSD: patterns-tester.c,v 1.1 2015/06/23 18:03:09 semarie Exp $ */
 /*
- * Copyright (c) 2015 Sebastien Marie
+ * Copyright (c) 2015 Sebastien Marie <semarie@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/regress/patterns/patterns-tester.lua b/regress/patterns/patterns-tester.lua
index 15df0a7..5bc476a 100644
--- a/regress/patterns/patterns-tester.lua
+++ b/regress/patterns/patterns-tester.lua
@@ -1,2 +1,3 @@
+-- $OpenBSD: patterns-tester.lua,v 1.1 2015/06/23 18:03:09 semarie Exp $
 print(string.format("string='%s'\npattern='%s'", arg[1], arg[2]));
 print(string.match(arg[1], arg[2]));
diff --git a/regress/patterns/test-patterns-lua.out b/regress/patterns/test-patterns-lua.out
index 0cab468..b154925 100644
--- a/regress/patterns/test-patterns-lua.out
+++ b/regress/patterns/test-patterns-lua.out
@@ -1,4 +1,3 @@
-# $OpenBSD$
 string='/page/51'
 pattern='^/(%a+)/(%d+)$'
 page	51
@@ -37,92 +36,92 @@ pattern='no-%d-match'
 nil
 string='/page/page-51'
 pattern='/(.*)/%9-(%d+)'
-lua53: ./patterns-tester.lua:2: invalid capture index %9
+X_PATTERNS_TESTER_X:3: invalid capture index %9
 stack traceback:
 	[C]: in function 'string.match'
-	./patterns-tester.lua:2: in main chunk
+X_PATTERNS_TESTER_X:3: in main chunk
 	[C]: in ?
 string=':-)'
 pattern=')+'
-lua53: ./patterns-tester.lua:2: invalid pattern capture
+X_PATTERNS_TESTER_X:3: invalid pattern capture
 stack traceback:
 	[C]: in function 'string.match'
-	./patterns-tester.lua:2: in main chunk
+X_PATTERNS_TESTER_X:3: in main chunk
 	[C]: in ?
 string='/page/51'
 pattern='/page/51('
-lua53: ./patterns-tester.lua:2: unfinished capture
+X_PATTERNS_TESTER_X:3: unfinished capture
 stack traceback:
 	[C]: in function 'string.match'
-	./patterns-tester.lua:2: in main chunk
+X_PATTERNS_TESTER_X:3: in main chunk
 	[C]: in ?
 string='/page/51'
 pattern='/page/51%'
-lua53: ./patterns-tester.lua:2: malformed pattern (ends with '%')
+X_PATTERNS_TESTER_X:3: malformed pattern (ends with '%')
 stack traceback:
 	[C]: in function 'string.match'
-	./patterns-tester.lua:2: in main chunk
+X_PATTERNS_TESTER_X:3: in main chunk
 	[C]: in ?
 string='/page/51'
 pattern='/page/[51'
-lua53: ./patterns-tester.lua:2: malformed pattern (missing ']')
+X_PATTERNS_TESTER_X:3: malformed pattern (missing ']')
 stack traceback:
 	[C]: in function 'string.match'
-	./patterns-tester.lua:2: in main chunk
+X_PATTERNS_TESTER_X:3: in main chunk
 	[C]: in ?
 string='/page/(51)'
 pattern='/page/%b('
-lua53: ./patterns-tester.lua:2: malformed pattern (missing arguments to '%b')
+X_PATTERNS_TESTER_X:3: malformed pattern (missing arguments to '%b')
 stack traceback:
 	[C]: in function 'string.match'
-	./patterns-tester.lua:2: in main chunk
+X_PATTERNS_TESTER_X:3: in main chunk
 	[C]: in ?
 string='/page/51'
 pattern='()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()'
-lua53: ./patterns-tester.lua:2: too many captures
+X_PATTERNS_TESTER_X:3: too many captures
 stack traceback:
 	[C]: in function 'string.match'
-	./patterns-tester.lua:2: in main chunk
+X_PATTERNS_TESTER_X:3: in main chunk
 	[C]: in ?
 string='/page/51'
 pattern='/page/%f'
-lua53: ./patterns-tester.lua:2: missing '[' after '%f' in pattern
+X_PATTERNS_TESTER_X:3: missing '[' after '%f' in pattern
 stack traceback:
 	[C]: in function 'string.match'
-	./patterns-tester.lua:2: in main chunk
+X_PATTERNS_TESTER_X:3: in main chunk
 	[C]: in ?
 string='/page/51'
 pattern='/page%f/51'
-lua53: ./patterns-tester.lua:2: missing '[' after '%f' in pattern
+X_PATTERNS_TESTER_X:3: missing '[' after '%f' in pattern
 stack traceback:
 	[C]: in function 'string.match'
-	./patterns-tester.lua:2: in main chunk
+X_PATTERNS_TESTER_X:3: in main chunk
 	[C]: in ?
 string='q*********************************'
 pattern='*************************************q'
-lua53: ./patterns-tester.lua:2: max repetition items
+X_PATTERNS_TESTER_X:3: max repetition items
 stack traceback:
 	[C]: in function 'string.match'
-	./patterns-tester.lua:2: in main chunk
+X_PATTERNS_TESTER_X:3: in main chunk
 	[C]: in ?
 string='q+++++++++++++++++++++++++++++++++'
 pattern='+++++++++++++++++++++++++++++++++++++q'
-lua53: ./patterns-tester.lua:2: max repetition items
+X_PATTERNS_TESTER_X:3: max repetition items
 stack traceback:
 	[C]: in function 'string.match'
-	./patterns-tester.lua:2: in main chunk
+X_PATTERNS_TESTER_X:3: in main chunk
 	[C]: in ?
 string='q---------------------------------'
 pattern='-------------------------------------q'
-lua53: ./patterns-tester.lua:2: max repetition items
+X_PATTERNS_TESTER_X:3: max repetition items
 stack traceback:
 	[C]: in function 'string.match'
-	./patterns-tester.lua:2: in main chunk
+X_PATTERNS_TESTER_X:3: in main chunk
 	[C]: in ?
 string='q?????????????????????????????????'
 pattern='?????????????????????????????????????q'
-lua53: ./patterns-tester.lua:2: max repetition items
+X_PATTERNS_TESTER_X:3: max repetition items
 stack traceback:
 	[C]: in function 'string.match'
-	./patterns-tester.lua:2: in main chunk
+X_PATTERNS_TESTER_X:3: in main chunk
 	[C]: in ?
diff --git a/regress/patterns/test-patterns.in b/regress/patterns/test-patterns.in
index 5abef1f..a988d81 100644
--- a/regress/patterns/test-patterns.in
+++ b/regress/patterns/test-patterns.in
@@ -1,4 +1,4 @@
-# $OpenBSD$
+# $OpenBSD: test-patterns.in,v 1.1 2015/06/23 18:03:09 semarie Exp $
 # string	pattern				comments
 /page/51	^/(%a+)/(%d+)$
 /Apage/51	/[^%d][%w%u][^%c]+()[%d]+	
diff --git a/regress/patterns/test-patterns.out b/regress/patterns/test-patterns.out
index aecb9f0..2f46020 100644
--- a/regress/patterns/test-patterns.out
+++ b/regress/patterns/test-patterns.out
@@ -1,4 +1,4 @@
-# $OpenBSD$
+# $OpenBSD: test-patterns.out,v 1.1 2015/06/23 18:03:09 semarie Exp $
 string='/page/51'
 pattern='^/(%a+)/(%d+)$'
 ret=0 num=3