svn commit: r272057 - in head: . contrib/pjdfstest tools/regression/pjdfstest

[Garrett Cooper]

Author: ngie
Date: Wed Sep 24 07:00:35 2014
New Revision: 272057
URL: http://svnweb.freebsd.org/changeset/base/272057

Log:
  Import pjdfstest from ^/vendor/pjdfstest/abf03c3a47745d4521b0e4aa141317553ca48f91
  
  - Remove tools/regression/pjdfstest
  - Add upgrade directions for contrib/pjdfstest
  - Add a note to UPDATING for the move (the reachover Makefiles are coming
    soon)
  
  Functional differences:
  - ftruncate testcases are added from upstream (github)
  
  Non-functional differences:
  - The copyright for the project has been updated to 2012
  - pjd's contact information has been updated
  
  Discussed with: -testing, jmmv, pjd
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Added:
  head/contrib/pjdfstest/
     - copied from r272055, vendor/pjdfstest/abf03c3a47745d4521b0e4aa141317553ca48f91/
  head/contrib/pjdfstest/FREEBSD-upgrade
Deleted:
  head/tools/regression/pjdfstest/
Modified:
  head/UPDATING

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Sep 24 06:50:14 2014	(r272056)
+++ head/UPDATING	Wed Sep 24 07:00:35 2014	(r272057)
@@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20140923:
+	pjdfstest has been moved from tools/regression/pjdfstest to
+	contrib/pjdfstest .
+
 20140922:
 	At svn r271982, The default linux compat kernel ABI has been adjusted
 	to 2.6.18 in support of the linux-c6 compat ports infrastructure

Added: head/contrib/pjdfstest/FREEBSD-upgrade
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/contrib/pjdfstest/FREEBSD-upgrade	Wed Sep 24 07:00:35 2014	(r272057)
@@ -0,0 +1,25 @@
+$FreeBSD$
+
+This document contains a collection of notes specific to the import
+of pjdfstest into head.  These notes are built on the instructions in
+the FreeBSD Subversion Primer that detail how to deal with vendor
+branches and you are supposed to follow those:
+
+	http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html
+
+The pjdfstest source code is hosted on GitHub:
+
+	https://github.com/pjd/pjdfstest
+
+and is imported into the pjdfstest vendor branch (see base/vendor/pjdfstest/).
+
+To merge the vendor branch into head do something like this:
+
+	cd .../base/head/contrib/pjdfstest
+	svn merge --accept=postpone \
+	    svn+ssh://svn.freebsd.org/base/vendor/pjdfstest/dist .
+
+and resolve any conflicts that may arise at this point.
+
+Lastly, with the list of old and new files in this import, make sure
+to update the reachover Makefiles accordingly.