From owner-svn-src-user@FreeBSD.ORG Thu Jul 21 19:06:52 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 3BF381065672; Thu, 21 Jul 2011 19:06:52 +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 2BA4C8FC12; Thu, 21 Jul 2011 19:06:52 +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 p6LJ6q3O081943; Thu, 21 Jul 2011 19:06:52 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6LJ6qAR081941; Thu, 21 Jul 2011 19:06:52 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201107211906.p6LJ6qAR081941@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 21 Jul 2011 19:06:52 +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: r224248 - user/gabor/tre-integration/tools/test/regex 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: Thu, 21 Jul 2011 19:06:52 -0000 Author: gabor Date: Thu Jul 21 19:06:51 2011 New Revision: 224248 URL: http://svn.freebsd.org/changeset/base/224248 Log: - Add -s flag to cut to be more safe with comment lines Modified: user/gabor/tre-integration/tools/test/regex/Makefile Modified: user/gabor/tre-integration/tools/test/regex/Makefile ============================================================================== --- user/gabor/tre-integration/tools/test/regex/Makefile Thu Jul 21 17:20:44 2011 (r224247) +++ user/gabor/tre-integration/tools/test/regex/Makefile Thu Jul 21 19:06:51 2011 (r224248) @@ -10,9 +10,9 @@ test: regmatch @echo "=== Running test ${t} ===" @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`; \ + 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}`; \ if [ "$${match}" != "$${result}" ]; then \ echo "Failed matching pattern $${pat} to string $${str}"; \