diff options
author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
---|---|---|
committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
commit | ee7b0571c2c18bdec848ed2044223cc88db29bd8 (patch) | |
tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.sbin/chown | |
parent | ffda191e301f128a62c152fde92b692548367fca (diff) | |
parent | 15fc2873832ea5b9b639e701bbbf2e73af8b6a88 (diff) | |
download | src-ee7b0571c2c18bdec848ed2044223cc88db29bd8.tar.gz src-ee7b0571c2c18bdec848ed2044223cc88db29bd8.zip |
Merge head from 7/28
Notes
Notes:
svn path=/projects/bmake/; revision=270164
Diffstat (limited to 'usr.sbin/chown')
-rw-r--r-- | usr.sbin/chown/Makefile | 6 | ||||
-rw-r--r-- | usr.sbin/chown/tests/Makefile | 9 | ||||
-rwxr-xr-x | usr.sbin/chown/tests/chown-f_test.sh | 21 |
3 files changed, 36 insertions, 0 deletions
diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile index 97972e5684ed..7bcb67724832 100644 --- a/usr.sbin/chown/Makefile +++ b/usr.sbin/chown/Makefile @@ -1,8 +1,14 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.include <src.opts.mk> + PROG= chown LINKS= ${BINDIR}/chown /usr/bin/chgrp MAN= chgrp.1 chown.8 +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> diff --git a/usr.sbin/chown/tests/Makefile b/usr.sbin/chown/tests/Makefile new file mode 100644 index 000000000000..fb13f3fb0abe --- /dev/null +++ b/usr.sbin/chown/tests/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +.include <bsd.own.mk> + +TESTSDIR= ${TESTSBASE}/bin/chown + +TAP_TESTS_SH= chown-f_test + +.include <bsd.test.mk> diff --git a/usr.sbin/chown/tests/chown-f_test.sh b/usr.sbin/chown/tests/chown-f_test.sh new file mode 100755 index 000000000000..c66b0085fc25 --- /dev/null +++ b/usr.sbin/chown/tests/chown-f_test.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# $FreeBSD$ + +base=`basename $0` + +echo "1..1" + +name="chown -f root:wheel file" +if [ `id -u` -eq 0 ]; then + echo "ok 1 - $name # skip Test must not be uid 0." +else + touch file + output=$(chown -f root:wheel file 2>&1) + if [ $? -eq 0 -a -z "$output" ] + then + echo "ok 1 - $name" + else + echo "not ok 1 - $name" + fi + rm file +fi |