From owner-svn-src-all@FreeBSD.ORG Fri Aug 6 21:57:12 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E4271065687; Fri, 6 Aug 2010 21:57:12 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2D5348FC12; Fri, 6 Aug 2010 21:57:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o76LvCVR042978; Fri, 6 Aug 2010 21:57:12 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o76LvCnr042976; Fri, 6 Aug 2010 21:57:12 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201008062157.o76LvCnr042976@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Fri, 6 Aug 2010 21:57:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210972 - head/tools/regression/fstest/tests X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2010 21:57:12 -0000 Author: pjd Date: Fri Aug 6 21:57:11 2010 New Revision: 210972 URL: http://svn.freebsd.org/changeset/base/210972 Log: Don't use egrep directly - use ${GREP}. Modified: head/tools/regression/fstest/tests/misc.sh Modified: head/tools/regression/fstest/tests/misc.sh ============================================================================== --- head/tools/regression/fstest/tests/misc.sh Fri Aug 6 21:56:32 2010 (r210971) +++ head/tools/regression/fstest/tests/misc.sh Fri Aug 6 21:57:11 2010 (r210972) @@ -9,7 +9,7 @@ path1021="${name255}/${name255}/${name25 path1023="${path1021}/x" path1024="${path1023}x" -echo ${dir} | egrep '^/' >/dev/null 2>&1 +echo ${dir} | ${GREP} -E '^/' >/dev/null 2>&1 if [ $? -eq 0 ]; then maindir="${dir}/../.." else @@ -23,7 +23,7 @@ expect() e="${1}" shift r=`${fstest} $* 2>/dev/null | tail -1` - echo "${r}" | egrep '^'${e}'$' >/dev/null 2>&1 + echo "${r}" | ${GREP} -E '^'${e}'$' >/dev/null 2>&1 if [ $? -eq 0 ]; then if [ -z "${todomsg}" ]; then echo "ok ${ntest}" @@ -48,7 +48,7 @@ jexpect() e="${3}" shift 3 r=`jail -s ${s} / fstest 127.0.0.1 /bin/sh -c "cd ${d} && ${fstest} $* 2>/dev/null" | tail -1` - echo "${r}" | egrep '^'${e}'$' >/dev/null 2>&1 + echo "${r}" | ${GREP} -E '^'${e}'$' >/dev/null 2>&1 if [ $? -eq 0 ]; then if [ -z "${todomsg}" ]; then echo "ok ${ntest}"