From owner-svn-src-all@FreeBSD.ORG Sun Nov 23 19:50:21 2008 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 32F881065675; Sun, 23 Nov 2008 19:50:21 +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 207A18FC13; Sun, 23 Nov 2008 19:50:21 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mANJoLkQ061810; Sun, 23 Nov 2008 19:50:21 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mANJoLqJ061809; Sun, 23 Nov 2008 19:50:21 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <200811231950.mANJoLqJ061809@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Sun, 23 Nov 2008 19:50:21 +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: r185216 - 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: Sun, 23 Nov 2008 19:50:21 -0000 Author: pjd Date: Sun Nov 23 19:50:20 2008 New Revision: 185216 URL: http://svn.freebsd.org/changeset/base/185216 Log: fstest for Linux: - Use /dev/urandom, it is more portable. - Implement todo() function which allows to mark known failures. Modified: head/tools/regression/fstest/tests/misc.sh Modified: head/tools/regression/fstest/tests/misc.sh ============================================================================== --- head/tools/regression/fstest/tests/misc.sh Sun Nov 23 19:43:45 2008 (r185215) +++ head/tools/regression/fstest/tests/misc.sh Sun Nov 23 19:50:20 2008 (r185216) @@ -27,7 +27,12 @@ expect() if [ $? -eq 0 ]; then echo "ok ${ntest}" else - echo "not ok ${ntest} - tried '$*', expected ${e}, got ${r}" + if [ -z "${todomsg}" ]; then + echo "not ok ${ntest} - tried '$*', expected ${e}, got ${r}" + else + echo "not ok ${ntest} # TODO ${todomsg}" + todomsg="" + fi fi ntest=`expr $ntest + 1` } @@ -43,7 +48,12 @@ jexpect() if [ $? -eq 0 ]; then echo "ok ${ntest}" else - echo "not ok ${ntest} - tried '$*', expected ${e}, got ${r}" + if [ -z "${todomsg}" ]; then + echo "not ok ${ntest} - tried '$*', expected ${e}, got ${r}" + else + echo "not ok ${ntest} # TODO ${todomsg}" + todomsg="" + fi fi ntest=`expr $ntest + 1` } @@ -53,14 +63,27 @@ test_check() if [ $* ]; then echo "ok ${ntest}" else - echo "not ok ${ntest}" + if [ -z "${todomsg}" ]; then + echo "not ok ${ntest}" + else + echo "not ok ${ntest} # TODO ${todomsg}" + todomsg="" + fi fi ntest=`expr $ntest + 1` } +todo() +{ + echo "${os}" | grep -iq "${1}" + if [ $? -eq 0 ]; then + todomsg="${2}" + fi +} + namegen() { - echo "fstest_`dd if=/dev/random bs=1k count=1 2>/dev/null | openssl md5`" + echo "fstest_`dd if=/dev/urandom bs=1k count=1 2>/dev/null | openssl md5`" } quick_exit()