From owner-svn-src-user@FreeBSD.ORG  Sat Sep 13 06:13:56 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 54775A9F;
 Sat, 13 Sep 2014 06:13:56 +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 3F86CBB;
 Sat, 13 Sep 2014 06:13:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8D6Du83017319;
 Sat, 13 Sep 2014 06:13:56 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8D6DugQ017318;
 Sat, 13 Sep 2014 06:13:56 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201409130613.s8D6DugQ017318@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: Sat, 13 Sep 2014 06:13:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r271498 - 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: Sat, 13 Sep 2014 06:13:56 -0000

Author: ngie
Date: Sat Sep 13 06:13:55 2014
New Revision: 271498
URL: http://svnweb.freebsd.org/changeset/base/271498

Log:
  Revert r271378 -- I will approach this differently upstream

Modified:
  user/ngie/add-pjdfstest/contrib/pjdfstest/tests/misc.sh

Modified: user/ngie/add-pjdfstest/contrib/pjdfstest/tests/misc.sh
==============================================================================
--- user/ngie/add-pjdfstest/contrib/pjdfstest/tests/misc.sh	Sat Sep 13 05:54:31 2014	(r271497)
+++ user/ngie/add-pjdfstest/contrib/pjdfstest/tests/misc.sh	Sat Sep 13 06:13:55 2014	(r271498)
@@ -4,14 +4,14 @@ ntest=1
 
 case "${dir}" in
 /*)
-	maindir="${dir}/.."
+	maindir="${dir}/../.."
 	;;
 *)
-	maindir="`pwd`/${dir}/.."
+	maindir="`pwd`/${dir}/../.."
 	;;
 esac
 fstest="${maindir}/pjdfstest"
-. ${maindir}/conf
+. ${maindir}/tests/conf
 
 expect()
 {