From owner-svn-src-all@FreeBSD.ORG  Fri Mar 15 00:10:38 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id CC75C9FA;
 Fri, 15 Mar 2013 00:10:38 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BD90137C;
 Fri, 15 Mar 2013 00:10:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2F0AckI076591;
 Fri, 15 Mar 2013 00:10:38 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2F0AcuB076569;
 Fri, 15 Mar 2013 00:10:38 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201303150010.r2F0AcuB076569@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Fri, 15 Mar 2013 00:10:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248304 - head/tools/regression/pjdfstest/tests
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Mar 2013 00:10:38 -0000

Author: pjd
Date: Fri Mar 15 00:10:38 2013
New Revision: 248304
URL: http://svnweb.freebsd.org/changeset/base/248304

Log:
  Make file name generation to work with both new and old versions of OpenSSL.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/tools/regression/pjdfstest/tests/misc.sh

Modified: head/tools/regression/pjdfstest/tests/misc.sh
==============================================================================
--- head/tools/regression/pjdfstest/tests/misc.sh	Fri Mar 15 00:05:50 2013	(r248303)
+++ head/tools/regression/pjdfstest/tests/misc.sh	Fri Mar 15 00:10:38 2013	(r248304)
@@ -89,7 +89,7 @@ todo()
 
 namegen()
 {
-	echo "pjdfstest_`dd if=/dev/urandom bs=1k count=1 2>/dev/null | openssl md5`"
+	echo "pjdfstest_`dd if=/dev/urandom bs=1k count=1 2>/dev/null | openssl md5 | awk '{print $NF}'`"
 }
 
 namegen_len()
@@ -98,7 +98,7 @@ namegen_len()
 
 	name=""
 	while :; do
-		namepart="`dd if=/dev/urandom bs=64 count=1 2>/dev/null | openssl md5`"
+		namepart="`dd if=/dev/urandom bs=64 count=1 2>/dev/null | openssl md5 | awk '{print $NF}'`"
 		name="${name}${namepart}"
 		curlen=`printf "%s" "${name}" | wc -c`
 		[ ${curlen} -lt ${len} ] || break