Minor fixes.

* src/names.c: Include argp.h
* tests/testsuite.at (AT_XATTRS_UTILS_PREREQ)
(AT_SELINUX_UTILS_PREREQ,AT_ACLS_UTILS_PREREQ)
(AT_CAPABILITIES_UTILS_PREREQ)
(AT_XATTRS_PREREQ,AT_SELINUX_PREREQ)
(AT_ACLS_PREREQ): Use POSIX-compatible syntax for
mktemp.
* tests/incr08.at: Fix find usage.
This commit is contained in:
Sergey Poznyakoff
2013-10-05 23:27:20 +03:00
parent 3de5db2a15
commit 6d5cfeb757
3 changed files with 9 additions and 8 deletions

View File

@@ -22,6 +22,7 @@
#include <hash.h>
#include <quotearg.h>
#include <wordsplit.h>
#include <argp.h>
#include "common.h"

View File

@@ -48,7 +48,7 @@ mkdir foo/subdir/dir1
mkdir subdir
mkdir subdir/dir2
decho A
find|sort
find .|sort
decho B
DIR=`pwd`

View File

@@ -125,31 +125,31 @@ m4_define([AT_CHECK_UTIL],[
])
m4_define([AT_XATTRS_UTILS_PREREQ],[
file=$( mktemp -p . )
file=$(TMPDIR=. mktemp fiXXXXXX)
AT_CHECK_UTIL(setfattr -n user.test -v test $file,0)
AT_CHECK_UTIL(getfattr $file,0)
])
m4_define([AT_SELINUX_UTILS_PREREQ],[
file=$( mktemp -p . )
file=$(TMPDIR=. mktemp fiXXXXXX)
AT_CHECK_UTIL(restorecon $file, 0)
AT_CHECK_UTIL(chcon -h --user=unconfined_u $file,0)
rm -rf $file
])
m4_define([AT_ACLS_UTILS_PREREQ],[
file=$( mktemp -p . )
file=$(TMPDIR=. mktemp fiXXXXXX)
AT_CHECK_UTIL(setfacl -m u:$UID:rwx $file,0)
AT_CHECK_UTIL(getfacl $file,0)
rm -rf $file
])
m4_define([AT_CAPABILITIES_UTILS_PREREQ],[
file=$( mktemp -p . )
file=$(TMPDIR=. mktemp fiXXXXXX)
AT_CHECK_UTIL(setcap "= cap_chown=ei" $file,0)
AT_CHECK_UTIL(getcap $file,0)
rm -rf $file
])
m4_define([AT_XATTRS_PREREQ],[
AT_XATTRS_UTILS_PREREQ
file=$( mktemp -p . )
file=$(TMPDIR=. mktemp fiXXXXXX)
setfattr -n user.test -v ahoj $file
# check whether tar fails to store xattrs
err=$( tar --xattrs -cf /dev/null $file 2>&1 >/dev/null | wc -l )
@@ -159,7 +159,7 @@ m4_define([AT_XATTRS_PREREQ],[
])
m4_define([AT_SELINUX_PREREQ],[
AT_SELINUX_UTILS_PREREQ
file=$( mktemp -p . )
file=$(TMPDIR=. mktemp fiXXXXXX)
err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l )
if test "$err" != "0"; then
AT_SKIP_TEST
@@ -167,7 +167,7 @@ m4_define([AT_SELINUX_PREREQ],[
])
m4_define([AT_ACLS_PREREQ],[
AT_ACLS_UTILS_PREREQ
file=$( mktemp -p . )
file=$(TMPDIR=. mktemp fiXXXXXX)
setfacl -m u:$UID:rwx $file
err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l )
if test "$err" != "0"; then