summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2007-09-10 19:08:31 +0200
committerJim Meyering <jim@meyering.net>2007-09-15 08:40:39 +0200
commit47b7234de3600a3777f015ad4792dda622b0a921 (patch)
treed57300fadc318113cadbc71b36b9610dee46930b
parentd62bdb30f7ee8114162239178bc077ea81ecac38 (diff)
downloadcoreutils-47b7234de3600a3777f015ad4792dda622b0a921.tar.xz
Move the sole test in tests/unexpand to tests/misc/unexpand.
* tests/unexpand/basic-1: Move this file to ... * tests/misc/unexpand: ...here. Don't rely on $PROG in env. * tests/misc/Makefile.am (TESTS): Add unexpand. * tests/Makefile.am (SUBDIRS): Remove unexpand. * tests/unexpand: Remove the directory. * configure.ac (AC_CONFIG_FILES): Remove tests/unexpand/Makefile.
-rw-r--r--configure.ac1
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/misc/Makefile.am3
-rwxr-xr-xtests/misc/unexpand (renamed from tests/unexpand/basic-1)5
-rw-r--r--tests/unexpand/Makefile.am13
5 files changed, 5 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac
index e8e19cb8d..98393e499 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,7 +370,6 @@ AC_CONFIG_FILES(
tests/touch/Makefile
tests/tr/Makefile
tests/tsort/Makefile
- tests/unexpand/Makefile
tests/uniq/Makefile
tests/wc/Makefile
)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ef06667d4..aeae39557 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -47,7 +47,7 @@ SUBDIRS = \
chgrp chmod chown cp cut dd du head \
install join ln ls ls-2 misc mkdir mv od pr readlink rm rmdir \
sha1sum shred sort stty sum tac tail tail-2 tee test touch tr \
- tsort unexpand uniq wc
+ tsort uniq wc
## N O T E :: Please do not add new directories.
all_t = t1 t2 t3 t4 t5 t6 t7 t8 t9
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index ab5373767..7decb29fd 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -103,6 +103,7 @@ TESTS = \
stat-printf \
tac-continue \
test-diag \
- tty-eof
+ tty-eof \
+ unexpand
include $(top_srcdir)/tests/check.mk
diff --git a/tests/unexpand/basic-1 b/tests/misc/unexpand
index 64f4ea66c..9752524d5 100755
--- a/tests/unexpand/basic-1
+++ b/tests/misc/unexpand
@@ -1,8 +1,7 @@
#!/bin/sh
# Test "unexpand".
-# Copyright (C) 2000, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000, 2003-2007 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -36,7 +35,7 @@ use strict;
# Turn off localisation of executable's ouput.
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
-my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
+my $prog = 'unexpand';
my @Tests =
(
diff --git a/tests/unexpand/Makefile.am b/tests/unexpand/Makefile.am
deleted file mode 100644
index 6c692bdf3..000000000
--- a/tests/unexpand/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-
-EXTRA_DIST = $(TESTS)
-
-TESTS_ENVIRONMENT = \
- top_srcdir=$(top_srcdir) \
- srcdir=$(srcdir) \
- PERL="$(PERL)" \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
- PROG=unexpand
-
-TESTS = basic-1