summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-04-24 12:58:24 +0200
committerJim Meyering <meyering@redhat.com>2008-04-27 21:31:32 +0200
commit53d8a2c412cccd2ee5ee7760f6fcf1890c5e9e3b (patch)
treeadebb62c30969e1baf2489868c1119af0183383d /tests
parent427f179542e9f7228f77affdd5a4c50a573b4894 (diff)
downloadcoreutils-53d8a2c412cccd2ee5ee7760f6fcf1890c5e9e3b.tar.xz
tests: put root-only (usually skipped) tests at the end
* tests/Makefile.am (TESTS): Don't list root-only tests explicitly. Instead, just use $(root_tests). * tests/check.mk (vc_exe_in_TESTS): Now that root_tests are separate, parse out the union of $(TESTS) and $(root_tests).
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am16
-rw-r--r--tests/check.mk8
2 files changed, 8 insertions, 16 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2a16989e1..f340eeb82 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -88,7 +88,6 @@ TESTS = \
rm/empty-inacc \
rm/empty-name \
rm/f-1 \
- rm/fail-2eperm \
rm/fail-eacces \
rm/fail-eperm \
rm/hash \
@@ -101,8 +100,6 @@ TESTS = \
rm/interactive-once \
rm/ir-1 \
rm/isatty \
- rm/no-give-up \
- rm/one-file-system \
rm/r-1 \
rm/r-2 \
rm/r-3 \
@@ -136,7 +133,6 @@ TESTS = \
misc/pr \
misc/df-P \
misc/pwd-unreadable-parent \
- misc/chcon \
misc/chcon-fail \
misc/selinux \
misc/cut \
@@ -218,7 +214,6 @@ TESTS = \
chmod/thru-dangling \
chmod/umask-x \
chmod/usage \
- chown/basic \
chown/deref \
chown/preserve-root \
chown/separator \
@@ -228,7 +223,6 @@ TESTS = \
cp/backup-dir \
cp/backup-is-src \
cp/cp-HL \
- cp/cp-a-selinux \
cp/cp-deref \
cp/cp-i \
cp/cp-mv-backup \
@@ -251,13 +245,11 @@ TESTS = \
cp/parent-perm-race \
cp/perm \
cp/preserve-2 \
- cp/preserve-gid \
cp/proc-zero-len \
cp/r-vs-symlink \
cp/same-file \
cp/slink-2-slink \
cp/sparse \
- cp/special-bits \
cp/special-f \
cp/src-base-dot \
cp/symlink-slash \
@@ -306,7 +298,6 @@ TESTS = \
ls/infloop \
ls/inode \
ls/m-option \
- ls/nameless-uid \
ls/no-arg \
ls/proc-selinux-segfault \
ls/recursive \
@@ -328,7 +319,6 @@ TESTS = \
mkdir/selinux \
mkdir/special-1 \
mkdir/t-slash \
- mkdir/writable-under-readonly \
mv/acl \
mv/atomic \
mv/atomic2 \
@@ -365,7 +355,6 @@ TESTS = \
mv/partition-perm \
mv/perm-1 \
mv/reply-no \
- mv/sticky-to-xpart \
mv/to-symlink \
mv/trailing-slash \
mv/update \
@@ -376,7 +365,6 @@ TESTS = \
rmdir/fail-perm \
rmdir/ignore \
rmdir/t-slash \
- tail-2/append-only \
tail-2/assert \
tail-2/assert-2 \
tail-2/big-4gb \
@@ -392,9 +380,9 @@ TESTS = \
touch/no-create-missing \
touch/no-rights \
touch/not-owner \
- touch/now-owned-by-other \
touch/obsolescent \
touch/read-only \
- touch/relative
+ touch/relative \
+ $(root_tests)
include $(top_srcdir)/tests/check.mk
diff --git a/tests/check.mk b/tests/check.mk
index 978313b38..f62661ca0 100644
--- a/tests/check.mk
+++ b/tests/check.mk
@@ -18,12 +18,16 @@
# Collect test names from the line matching /^TESTS = \\$$/ to the following
# one that does not end in '\'.
_v = TESTS
+_w = root_tests
vc_exe_in_TESTS: Makefile
@rm -f t1 t2
@if test -d $(top_srcdir)/.git && test $(srcdir) = .; then \
- sed -n '/^$(_v) =[ ]*\\$$/,/[^\]$$/p' \
+ { sed -n '/^$(_v) =[ ]*\\$$/,/[^\]$$/p' \
$(srcdir)/Makefile.am \
- | sed 's/^ *//;/^\$$.*/d;/^$(_v) =/d' \
+ | sed 's/^ *//;/^\$$.*/d;/^$(_v) =/d'; \
+ sed -n '/^$(_w) =[ ]*\\$$/,/[^\]$$/p' \
+ $(srcdir)/Makefile.am \
+ | sed 's/^ *//;/^\$$.*/d;/^$(_w) =/d'; } \
| tr -s '\012\\' ' ' | fmt -1 | sort -u > t1 && \
for f in `cd $(top_srcdir) && build-aux/vc-list-files $(subdir)`; do \
f=`echo $$f|sed 's!^$(subdir)/!!'`; \