From owner-svn-src-user@FreeBSD.ORG  Mon Jul 18 14:41:09 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1A402106564A;
	Mon, 18 Jul 2011 14:41:09 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E4A608FC0C;
	Mon, 18 Jul 2011 14:41:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6IEf8Ft027079;
	Mon, 18 Jul 2011 14:41:08 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6IEf849027076;
	Mon, 18 Jul 2011 14:41:08 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201107181441.p6IEf849027076@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 18 Jul 2011 14:41:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224186 - in
	user/gabor/tre-integration/tools/test/regex: . regmatch
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jul 2011 14:41:09 -0000

Author: gabor
Date: Mon Jul 18 14:41:08 2011
New Revision: 224186
URL: http://svn.freebsd.org/changeset/base/224186

Log:
  - Add support for extended regex matching

Modified:
  user/gabor/tre-integration/tools/test/regex/Makefile
  user/gabor/tre-integration/tools/test/regex/regmatch/regmatch.c

Modified: user/gabor/tre-integration/tools/test/regex/Makefile
==============================================================================
--- user/gabor/tre-integration/tools/test/regex/Makefile	Mon Jul 18 14:05:14 2011	(r224185)
+++ user/gabor/tre-integration/tools/test/regex/Makefile	Mon Jul 18 14:41:08 2011	(r224186)
@@ -2,16 +2,18 @@
 
 SUBDIR=	regmatch
 
-TESTS=bre.tests
+TESTS=	bre.tests
+TESTS+=	ere.tests
 
 test: regmatch
 .for t in ${TESTS}
 	@echo "=== Running test ${t} ==="
-	@for l in `cat tests/${t} | grep -ve '^#'`; do \
+	@flags=`grep '# *FLAGS' tests/${t} | sed 's|# *FLAGS *||g'`; \
+	for l in `cat tests/${t} | grep -ve '^#'`; do \
 		str=`echo $${l} | cut -d \; -f 2`; \
 		pat=`echo $${l} | cut -d \; -f 1`; \
 		match=`echo $${l} | cut -d \; -f 3`; \
-		result=`env LC_ALL=C ./regmatch/regmatch $${pat} $${str}`; \
+		result=`env LC_ALL=C REGTEST_FLAGS=$${flags} ./regmatch/regmatch $${pat} $${str}`; \
 		if [ "$${match}" != "$${result}" ]; then \
 			echo "Failed matching pattern $${pat} to string $${str}"; \
 		else \

Modified: user/gabor/tre-integration/tools/test/regex/regmatch/regmatch.c
==============================================================================
--- user/gabor/tre-integration/tools/test/regex/regmatch/regmatch.c	Mon Jul 18 14:05:14 2011	(r224185)
+++ user/gabor/tre-integration/tools/test/regex/regmatch/regmatch.c	Mon Jul 18 14:41:08 2011	(r224186)
@@ -45,10 +45,17 @@ main(int argc, char *argv[])
 {
 	regex_t pattern;
 	regmatch_t pmatch;
+	char *env;
 	ssize_t len;
 	int cflags = 0, ret;
 	int eflags = REG_STARTEND;
 
+	env = getenv("REGTEST_FLAGS");
+	if (strchr(env, 'E') != NULL)
+		cflags |= REG_EXTENDED;
+	if (strchr(env, 'F') != NULL)
+		cflags |= REG_NOSPEC;
+
 	if (argc != 3)
 		usage();