svn commit: r316390 - in stable/11: share/doc/pjdfstest tests/sys/pjdfstest/tests

[Alan Somers]

Author: asomers
Date: Sun Apr  2 03:00:50 2017
New Revision: 316390
URL: https://svnweb.freebsd.org/changeset/base/316390

Log:
  MFC r314056:
  
  Improve pjdfstest run instructions
  
  In the Kyua era, it's no longer necessary to set PJDFSTEST_TEST_PATH.  Just
  use TMPDIR instead.
  
  Reviewed by:	ngie
  MFC after:	3 weeks
  Relnotes:	yes
  Sponsored by:	Spectra Logic Corp
  Differential Revision:	https://reviews.freebsd.org/D9340

Modified:
  stable/11/share/doc/pjdfstest/README
  stable/11/tests/sys/pjdfstest/tests/conf
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/doc/pjdfstest/README
==============================================================================
--- stable/11/share/doc/pjdfstest/README	Sun Apr  2 02:16:39 2017	(r316389)
+++ stable/11/share/doc/pjdfstest/README	Sun Apr  2 03:00:50 2017	(r316390)
@@ -1,6 +1,6 @@
-pjdfstest test suite execution is integrated into kyua. This README describes
-how to use pjdfstest in the default configuration (kyua work directory), and
-with a specific filesystem path.
+The pjdfstest test suite is normally run by kyua.  It requires kyua 0.11 or
+newer. This README describes how to use pjdfstest in the default configuration
+(kyua work directory), with a specific filesystem path, and with prove(1).
 
 Method 1. Executing with default configuration (kyua work directory)
 
@@ -23,14 +23,17 @@ Method 2. Executing with a specific file
     2. cd to the tests directory:
        % cd /usr/tests/sys/pjdfstest
     3. Run kyua:
-       % env PJDFSTEST_TEST_PATH=/mnt kyua test
+       % env TMPDIR=/mnt kyua test
 
-   WARNING: the above method violates the test program isolation algorithm
-   described in kyua(1); as such, $PJDFSTEST_TEST_PATH must be cleaned up after
-   executing the testcases.
-
-   It's highly recommended that $PJDFSTEST_TEST_PATH be pointed to a sandboxed
-   filesystem, e.g. a small UFS-formatted memory disk or ZFS dataset with
-   quotas enabled, so the filesystem can be easily destroyed after the test
-   execution is complete, and the testcases are properly bounded both in terms
-   of time and space.
+   Note that if HOME is undefined, this will result in kyua's logfile being
+   placed in TMPDIR, which may not be what you want.  You can always use
+   --logfile to explicitly select the log location.
+
+Method 3. Executing pjdfstest with prove
+
+    1. Elevate privileges:
+       % su -
+    2. cd to the temporary directory of your choice
+       % cd /mnt
+    3. Invoke a specific test manually
+       % prove -rv /usr/tests/sys/pjdfstest/chmod/00

Modified: stable/11/tests/sys/pjdfstest/tests/conf
==============================================================================
--- stable/11/tests/sys/pjdfstest/tests/conf	Sun Apr  2 02:16:39 2017	(r316389)
+++ stable/11/tests/sys/pjdfstest/tests/conf	Sun Apr  2 03:00:50 2017	(r316390)
@@ -2,13 +2,6 @@
 #
 # $FreeBSD$
 
-: ${PJDFSTEST_TEST_PATH=.}
-if ! cd ${PJDFSTEST_TEST_PATH}/; then
-	echo 'Please set PJDFSTEST_TEST_PATH to a valid filesystem path'
-	echo 'Bail out!'
-	exit 1
-fi
-
 GREP=grep
 mountpoint=$(df . | tail -1 | awk '{print $6}')
 fs=$(mount -p | awk '$2 == "'$mountpoint'" { print toupper($3) }')