summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2007-07-10 22:37:48 +0200
committerJim Meyering <jim@meyering.net>2007-07-10 23:39:05 +0200
commit89dc0194511bdf7709ad5fc63acd079d6fa62b75 (patch)
tree78ac3d864c9cb8546a3d704254c2daa96a0e813d /tests
parent471d33582e48a9f9527e231c9bbc575ee9b43e45 (diff)
downloadcoreutils-89dc0194511bdf7709ad5fc63acd079d6fa62b75.tar.xz
Skip "arch" test if it's not built.
* tests/misc/Makefile.am (built_programs): Define. (TESTS_ENVIRONMENT): Add $(built_programs), for... * tests/misc/arch: ...this: skip the test if arch is not built. * src/Makefile.am (built_programs.list): New rule. * tests/Makefile.am (built_programs): Rename from all_programs. (TESTS_ENVIRONMENT): Use built_programs, not all_programs. * tests/help-version: Likewise. * NEWS: Mention that using --enable-no-install-program=X may cause "make check" to fail. Signed-off-by: Jim Meyering <jim@meyering.net>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am4
-rwxr-xr-xtests/help-version8
-rw-r--r--tests/misc/Makefile.am5
-rwxr-xr-xtests/misc/arch6
4 files changed, 17 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4371d73a9..682a52c19 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,11 +5,11 @@
# current locale considers to be equal.
ASSORT = LC_ALL=C sort
-all_programs = (cd ../src && MAKEFLAGS= $(MAKE) -s all_programs.list)
+built_programs = (cd ../src && MAKEFLAGS= $(MAKE) -s built_programs.list)
TESTS = help-version
TESTS_ENVIRONMENT = \
- all_programs="`$(all_programs)`" \
+ built_programs="`$(built_programs)`" \
PACKAGE_BUGREPORT=$(PACKAGE_BUGREPORT) \
CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
PATH="$(VG_PATH_PREFIX)`pwd`/../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/help-version b/tests/help-version
index dd037eed6..d882d85f8 100755
--- a/tests/help-version
+++ b/tests/help-version
@@ -39,7 +39,7 @@ expected_failure_status_dir=2
expected_failure_status_ls=2
expected_failure_status_vdir=2
-case "$all_programs" in
+case "$built_programs" in
*groups*)
if test -w /dev/full && test -c /dev/full \
&& echo > /dev/full 2>/dev/null; then
@@ -59,7 +59,7 @@ scripts to fail, so it is being removed from the list of
programs checked by this test.
************************************************
EOF
- all_programs=`echo $all_programs | tr ' ' '\n' | grep -v '^groups$'`
+ built_programs=`echo $built_programs | tr ' ' '\n' | grep -v '^groups$'`
fi
;;
esac
@@ -67,7 +67,7 @@ esac
fail=0
for lang in C fr da; do
- for i in $all_programs; do
+ for i in $built_programs; do
# Skip `test'; it doesn't accept --help or --version.
test $i = test && continue;
@@ -196,7 +196,7 @@ stat_args=$tmp_in
unlink_args=$tmp_in
lbracket_args=": ]"
-for i in $all_programs; do
+for i in $built_programs; do
# Skip these.
case $i in chroot|stty|tty|false|chcon|runcon) continue;; esac
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index 0088e939d..5c1d1eac5 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -19,7 +19,11 @@
EXTRA_DIST = $(TESTS)
+built_programs = \
+ (cd $(top_builddir)/src && MAKEFLAGS= $(MAKE) -s built_programs.list)
+
TESTS_ENVIRONMENT = \
+ built_programs="`$(built_programs)`" \
top_srcdir=$(top_srcdir) \
abs_top_builddir=$(abs_top_builddir) \
srcdir=$(srcdir) \
@@ -40,6 +44,7 @@ TESTS_ENVIRONMENT = \
# will execute the test script rather than the standard utility.
TESTS = \
+ arch \
pr \
df-P \
pwd-unreadable-parent \
diff --git a/tests/misc/arch b/tests/misc/arch
index 4773491b4..a55a02c1c 100755
--- a/tests/misc/arch
+++ b/tests/misc/arch
@@ -18,6 +18,12 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
+# skip this test if arch isn't being built.
+case " $built_programs " in
+ *" arch "*) ;;
+ *) (exit 77); exit 77 ;;
+esac
+
if test "$VERBOSE" = yes; then
set -x
arch --version