diff options
| author | Jim Meyering <jim@meyering.net> | 2007-07-10 22:37:48 +0200 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-07-10 23:39:05 +0200 |
| commit | 89dc0194511bdf7709ad5fc63acd079d6fa62b75 (patch) | |
| tree | 78ac3d864c9cb8546a3d704254c2daa96a0e813d /tests/misc | |
| parent | 471d33582e48a9f9527e231c9bbc575ee9b43e45 (diff) | |
| download | coreutils-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/misc')
| -rw-r--r-- | tests/misc/Makefile.am | 5 | ||||
| -rwxr-xr-x | tests/misc/arch | 6 |
2 files changed, 11 insertions, 0 deletions
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 |