From owner-svn-src-head@FreeBSD.ORG  Mon Nov  3 21:21:09 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 060941A0;
 Mon,  3 Nov 2014 21:21:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E625BBCF;
 Mon,  3 Nov 2014 21:21:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA3LL8As026950;
 Mon, 3 Nov 2014 21:21:08 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA3LL8DX026949;
 Mon, 3 Nov 2014 21:21:08 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201411032121.sA3LL8DX026949@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 3 Nov 2014 21:21:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274061 - head/contrib/netbsd-tests/lib/libc/db
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Nov 2014 21:21:09 -0000

Author: ngie
Date: Mon Nov  3 21:21:08 2014
New Revision: 274061
URL: https://svnweb.freebsd.org/changeset/base/274061

Log:
  Port t_db.sh to FreeBSD
  
  - The blocksize on FreeBSD is 32kB, not 64kB
  - Add some detection for MK_DICT == no; /nonexistent is echoed along with
    atf_skip to ensure that the test will fail if dict(..) is called in the
    non-final stage of the pipeline
  
  Submitted by: pho

Modified:
  head/contrib/netbsd-tests/lib/libc/db/t_db.sh

Modified: head/contrib/netbsd-tests/lib/libc/db/t_db.sh
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/db/t_db.sh	Mon Nov  3 21:03:54 2014	(r274060)
+++ head/contrib/netbsd-tests/lib/libc/db/t_db.sh	Mon Nov  3 21:21:08 2014	(r274061)
@@ -41,6 +41,18 @@ dict()
 	fi
 }
 
+# Begin FreeBSD
+dict()
+{
+	if [ -f /usr/share/dict/words ]; then
+		echo /usr/share/dict/words
+	else
+		echo /nonexistent
+		atf_skip "Test requires dict/words"
+	fi
+}
+# End FreeBSD
+
 SEVEN_SEVEN="abcdefg|abcdefg|abcdefg|abcdefg|abcdefg|abcdefg|abcdefg"
 
 atf_test_case small_btree
@@ -887,7 +899,15 @@ r
 k1234
 EOF
 
+	# Begin FreeBSD
+	if true; then
+		atf_check "$(prog)" -i bsize=32768 hash in
+	else
+	# End FreeBSD
 	atf_check "$(prog)" -i bsize=65536 hash in
+	# Begin FreeBSD
+	fi
+	# End FreeBSD
 }
 
 atf_init_test_cases()