Date: Sun, 14 Sep 2014 09:04:02 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r271572 - in user/ngie/add-pjdfstest/contrib/pjdfstest: . tests Message-ID: <201409140904.s8E942L6086525@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409140904.s8E942L6086525>