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.)
This commit is contained in:
parent
47264cb680
commit
80d53cbe7f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=273928
@ -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
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user