svn commit: r273928 - head/contrib/netbsd-tests/usr.sbin/mtree

[Julio Merino]

Author: jmmv
Date: Sat Nov  1 11:07:59 2014
New Revision: 273928
URL: https://svnweb.freebsd.org/changeset/base/273928

Log:
  Put mtree test files into a subdirectory.
  
  Kyua 0.11 points TMPDIR to the test's work directory, and atf_check creates
  auxiliary files in TMPDIR.  This confuses a couple of mtree tests that were
  using the work directory's root to validate the contents of the directory.
  
  Fix the two affected tests by creating an auxiliary directory to use for
  the mtree tests.  (Kyua should probably do this on its own; filed bug #133
  upstream to take a look at this.)

Modified:
  head/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh

Modified: head/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh
==============================================================================
--- head/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh	Sat Nov  1 10:50:18 2014	(r273927)
+++ head/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh	Sat Nov  1 11:07:59 2014	(r273928)
@@ -284,6 +284,13 @@ ignore_head()
 
 ignore_body()
 {
+	# Kyua 0.11 and above point TMPDIR to our work directory and atf-check
+	# generates a temporary file, which confuses mtree.  Put the mtree files
+	# into a subdirectory.
+	#
+	# See https://github.com/jmmv/kyua/issues/133 for details.
+	mkdir root && cd root
+
 	mkdir newdir
 	mtree -F ${FLAVOR} -c | mtree -F ${FLAVOR} -Ck uid,gid,mode > mtree.spec
 	ln -s newdir otherdir
@@ -313,6 +320,13 @@ mtree_ignore_body() 
 }
 netbsd6_ignore_body() 
 {
+	# Kyua 0.11 and above point TMPDIR to our work directory and atf-check
+	# generates a temporary file, which confuses mtree.  Put the mtree files
+	# into a subdirectory.
+	#
+	# See https://github.com/jmmv/kyua/issues/133 for details.
+	mkdir root && cd root
+
 	FLAVOR=netbsd6 ignore_body
 }