diff options
author | Jim Meyering <jim@meyering.net> | 2007-09-10 19:01:39 +0200 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2007-09-15 08:40:39 +0200 |
commit | d62bdb30f7ee8114162239178bc077ea81ecac38 (patch) | |
tree | 49ec1bb2d9f713a93a48c8074f3a7c32d824f652 | |
parent | be23f60132655a40bc65fc8437509ec02663d1be (diff) | |
download | coreutils-d62bdb30f7ee8114162239178bc077ea81ecac38.tar.xz |
Move the sole test in tests/seq to tests/misc/seq.
* tests/seq/basic: Move this file to ...
* tests/misc/seq: ...here. Don't rely on $PROG in env.
* tests/misc/Makefile.am (TESTS): Add seq.
* tests/Makefile.am (SUBDIRS): Remove seq.
* tests/seq: Remove the directory.
* configure.ac (AC_CONFIG_FILES): Remove tests/seq/Makefile
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | tests/Makefile.am | 2 | ||||
-rw-r--r-- | tests/misc/Makefile.am | 1 | ||||
-rwxr-xr-x | tests/misc/seq (renamed from tests/seq/basic) | 3 | ||||
-rw-r--r-- | tests/seq/Makefile.am | 10 |
5 files changed, 3 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 048f26041..e8e19cb8d 100644 --- a/configure.ac +++ b/configure.ac @@ -357,7 +357,6 @@ AC_CONFIG_FILES( tests/readlink/Makefile tests/rm/Makefile tests/rmdir/Makefile - tests/seq/Makefile tests/sha1sum/Makefile tests/shred/Makefile tests/sort/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index 1984235b6..ef06667d4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -46,7 +46,7 @@ EXTRA_DIST = \ SUBDIRS = \ chgrp chmod chown cp cut dd du head \ install join ln ls ls-2 misc mkdir mv od pr readlink rm rmdir \ - seq sha1sum shred sort stty sum tac tail tail-2 tee test touch tr \ + sha1sum shred sort stty sum tac tail tail-2 tee test touch tr \ tsort unexpand uniq wc ## N O T E :: Please do not add new directories. diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am index 1d5334e19..ab5373767 100644 --- a/tests/misc/Makefile.am +++ b/tests/misc/Makefile.am @@ -87,6 +87,7 @@ TESTS = \ printf-hex \ pwd-long \ runcon-no-reorder \ + seq \ sha224sum \ sha256sum \ sha384sum \ diff --git a/tests/seq/basic b/tests/misc/seq index 843a09e81..2d662c39c 100755 --- a/tests/seq/basic +++ b/tests/misc/seq @@ -36,8 +36,6 @@ 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 @Tests = ( ['onearg-1', qw(10), {OUT => [(1..10)]}], @@ -95,6 +93,7 @@ foreach $t (@Tests) my $save_temps = $ENV{SAVE_TEMPS}; my $verbose = $ENV{VERBOSE}; +my $prog = 'seq'; my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); exit $fail; diff --git a/tests/seq/Makefile.am b/tests/seq/Makefile.am deleted file mode 100644 index 7463a5d3a..000000000 --- a/tests/seq/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## Process this file with automake to produce Makefile.in -*-Makefile-*-. -TESTS = basic -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=seq |