From owner-svn-src-user@FreeBSD.ORG Fri Jul 22 00:29:12 2011 Return-Path: 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 A0F461065670; Fri, 22 Jul 2011 00:29:12 +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 867D68FC08; Fri, 22 Jul 2011 00:29:12 +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 p6M0TCvO091774; Fri, 22 Jul 2011 00:29:12 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6M0TCBx091767; Fri, 22 Jul 2011 00:29:12 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201107220029.p6M0TCBx091767@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 22 Jul 2011 00:29:12 +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: r224258 - in user/gabor/tre-integration/tools/test/regex: . regmatch tests X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jul 2011 00:29:12 -0000 Author: gabor Date: Fri Jul 22 00:29:12 2011 New Revision: 224258 URL: http://svn.freebsd.org/changeset/base/224258 Log: - Add support for testing with different locales Added: user/gabor/tre-integration/tools/test/regex/tests/bre.es_ES.ISO8859-1.tests user/gabor/tre-integration/tools/test/regex/tests/bre.hu_HU.ISO8859-2.tests Modified: user/gabor/tre-integration/tools/test/regex/Makefile user/gabor/tre-integration/tools/test/regex/regmatch/regmatch.c user/gabor/tre-integration/tools/test/regex/tests/bre.tests user/gabor/tre-integration/tools/test/regex/tests/ere.tests Modified: user/gabor/tre-integration/tools/test/regex/Makefile ============================================================================== --- user/gabor/tre-integration/tools/test/regex/Makefile Thu Jul 21 23:22:09 2011 (r224257) +++ user/gabor/tre-integration/tools/test/regex/Makefile Fri Jul 22 00:29:12 2011 (r224258) @@ -4,16 +4,19 @@ SUBDIR= regmatch TESTS= bre.tests TESTS+= ere.tests +TESTS+= bre.hu_HU.ISO8859-2.tests +TESTS+= bre.es_ES.ISO8859-1.tests test: regmatch .for t in ${TESTS} @echo "=== Running test ${t} ===" @flags=`grep '# *FLAGS' tests/${t} | sed 's|# *FLAGS *||g'`; \ + locale=`grep '# *LOCALE' tests/${t} | sed 's|# *LOCALE *||g'`; \ for l in `cat tests/${t} | grep -ve '^#'`; do \ str=`echo $${l} | cut -d \; -s -f 2`; \ pat=`echo $${l} | cut -d \; -s -f 1`; \ match=`echo $${l} | cut -d \; -s -f 3`; \ - result=`env LC_ALL=C REGTEST_FLAGS=$${flags} ./regmatch/regmatch $${pat} $${str}`; \ + result=`env LC_ALL=$${locale} 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 Thu Jul 21 23:22:09 2011 (r224257) +++ user/gabor/tre-integration/tools/test/regex/regmatch/regmatch.c Fri Jul 22 00:29:12 2011 (r224258) @@ -27,6 +27,7 @@ */ #include +#include #include #include #include @@ -50,6 +51,8 @@ main(int argc, char *argv[]) int cflags = 0, ret; int eflags = REG_STARTEND; + setlocale(LC_ALL, ""); + env = getenv("REGTEST_FLAGS"); if (strchr(env, 'E') != NULL) cflags |= REG_EXTENDED; Added: user/gabor/tre-integration/tools/test/regex/tests/bre.es_ES.ISO8859-1.tests ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gabor/tre-integration/tools/test/regex/tests/bre.es_ES.ISO8859-1.tests Fri Jul 22 00:29:12 2011 (r224258) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +# LOCALE es_ES.ISO8859-1 + +# Fixed string and simple expressions +árbol;árbustoárbolcésped;((7,12)) +rińón;őărińónôâ;((2,7)) + +# Collating elements and equivalence classes +# NOTE: there is not much to check here with LC_ALL=C +[[.a.]];zzazzázz;((2,3),(5,6)) +[[=a=]];zzazzázz;((2,3),(5,6)) Added: user/gabor/tre-integration/tools/test/regex/tests/bre.hu_HU.ISO8859-2.tests ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gabor/tre-integration/tools/test/regex/tests/bre.hu_HU.ISO8859-2.tests Fri Jul 22 00:29:12 2011 (r224258) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +# LOCALE hu_HU.ISO8859-2 + +# Fixed string and simple expressions +szék;asztalszéklámpa;((6,10)) Modified: user/gabor/tre-integration/tools/test/regex/tests/bre.tests ============================================================================== --- user/gabor/tre-integration/tools/test/regex/tests/bre.tests Thu Jul 21 23:22:09 2011 (r224257) +++ user/gabor/tre-integration/tools/test/regex/tests/bre.tests Fri Jul 22 00:29:12 2011 (r224258) @@ -1,5 +1,7 @@ # $FreeBSD$ +# LOCALE C + # Fixed string and simple expressions foo;foobarfoobar;((0,3),(6,9)) ba.;foobarfoobaz;((3,6),(9,12)) Modified: user/gabor/tre-integration/tools/test/regex/tests/ere.tests ============================================================================== --- user/gabor/tre-integration/tools/test/regex/tests/ere.tests Thu Jul 21 23:22:09 2011 (r224257) +++ user/gabor/tre-integration/tools/test/regex/tests/ere.tests Fri Jul 22 00:29:12 2011 (r224258) @@ -1,6 +1,7 @@ # $FreeBSD$ # FLAGS E +# LOCALE C # Fixed string and simple expressions foo;foobarfoobar;((0,3),(6,9))