From owner-svn-src-user@FreeBSD.ORG  Sun Sep 14 09:04:03 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F23966DE;
 Sun, 14 Sep 2014 09:04:02 +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 C47D0AA0;
 Sun, 14 Sep 2014 09:04:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8E942EN086528;
 Sun, 14 Sep 2014 09:04:02 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8E942L6086525;
 Sun, 14 Sep 2014 09:04:02 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201409140904.s8E942L6086525@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: Sun, 14 Sep 2014 09:04:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r271572 - in user/ngie/add-pjdfstest/contrib/pjdfstest: .
 tests
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Sep 2014 09:04:03 -0000

Author: ngie
Date: Sun Sep 14 09:04:02 2014
New Revision: 271572
URL: http://svnweb.freebsd.org/changeset/base/271572

Log:
  Revert r271376; we will provide a canned conf file instead which will be in tests/sys/pjdfstest

Added:
  user/ngie/add-pjdfstest/contrib/pjdfstest/tests/conf
     - copied unchanged from r271375, user/ngie/add-pjdfstest/contrib/pjdfstest/tests/conf
Deleted:
  user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-Xlist
Modified:
  user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-upgrade

Modified: user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-upgrade
==============================================================================
--- user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-upgrade	Sun Sep 14 08:35:44 2014	(r271571)
+++ user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-upgrade	Sun Sep 14 09:04:02 2014	(r271572)
@@ -18,7 +18,6 @@ To merge the vendor branch into head do 
 	cd .../base/head/contrib/pjdfstest
 	svn merge --accept=postpone \
 	    svn+ssh://svn.freebsd.org/base/vendor/pjdfstest/dist .
-	svn remove --force $(cat FREEBSD-Xlist)
 
 and resolve any conflicts that may arise at this point.
 

Copied: user/ngie/add-pjdfstest/contrib/pjdfstest/tests/conf (from r271375, user/ngie/add-pjdfstest/contrib/pjdfstest/tests/conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/add-pjdfstest/contrib/pjdfstest/tests/conf	Sun Sep 14 09:04:02 2014	(r271572, copy of r271375, user/ngie/add-pjdfstest/contrib/pjdfstest/tests/conf)
@@ -0,0 +1,36 @@
+# $FreeBSD: head/tools/regression/pjdfstest/tests/conf 211354 2010-08-15 21:29:03Z pjd $
+# pjdfstest configuration file
+
+# Supported operating systems: FreeBSD, Darwin, SunOS, Linux
+os=`uname`
+
+case "${os}" in
+FreeBSD|Darwin)
+	GREP=grep
+	#fs=`df -T . | tail -1 | awk '{print $2}'`
+	pattern="`df . | tail -1 | awk '{printf("%s on %s \n", $1, $6)}'`"
+	fs=`mount | ${GREP} -E "^${pattern}" | awk -F '[(,]' '{print toupper($2)}'`
+	;;
+Solaris|SunOS)
+	GREP=ggrep
+	pattern=`df -Pk . | tail -1 | awk '{printf("%s on %s \n", $1, $6)}'`
+	fs=`mount -v | ${GREP} -E "^${pattern}" | awk '{print $5}' | \
+	    tr -s '[:lower:]' '[:upper:]'`
+	;;
+Linux)
+	GREP=grep
+	fs=`df -PT . | tail -1 | awk '{print toupper($2)}'`
+	;;
+*)
+	echo "Unsupported operating system ${os}." >/dev/stderr
+	exit 1
+	;;
+esac
+
+# If we cannot figure out file system type, define it here.
+#fs="UFS"
+
+if [ -z "${fs}" ]; then
+	echo "Cannot figure out file system type, define it by hand." >/dev/stderr
+	exit 1
+fi