From d62bdb30f7ee8114162239178bc077ea81ecac38 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Mon, 10 Sep 2007 19:01:39 +0200
Subject: 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
---
 configure.ac           |   1 -
 tests/Makefile.am      |   2 +-
 tests/misc/Makefile.am |   1 +
 tests/misc/seq         | 100 ++++++++++++++++++++++++++++++++++++++++++++++++
 tests/seq/Makefile.am  |  10 -----
 tests/seq/basic        | 101 -------------------------------------------------
 6 files changed, 102 insertions(+), 113 deletions(-)
 create mode 100755 tests/misc/seq
 delete mode 100644 tests/seq/Makefile.am
 delete mode 100755 tests/seq/basic

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/misc/seq b/tests/misc/seq
new file mode 100755
index 000000000..2d662c39c
--- /dev/null
+++ b/tests/misc/seq
@@ -0,0 +1,100 @@
+#!/bin/sh
+# -*- perl -*-
+# Test "seq".
+
+# Copyright (C) 1999, 2000, 2003, 2005-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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+: ${PERL=perl}
+: ${srcdir=.}
+
+$PERL -e 1 > /dev/null 2>&1 || {
+  echo 1>&2 "$0: configure didn't find a usable version of Perl," \
+    "so can't run this test"
+  exit 77
+}
+
+me=`echo $0|sed 's,.*/,,'`
+exec $PERL -w -I$srcdir/.. -MCoreutils -M"CuTmpdir qw($me)" -- - << \EOF
+require 5.003;
+use strict;
+
+(my $program_name = $0) =~ s|.*/||;
+
+# Turn off localisation of executable's ouput.
+@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
+
+my @Tests =
+  (
+   ['onearg-1',	qw(10),		{OUT => [(1..10)]}],
+   ['onearg-2',	qw(-1)],
+   ['neg-1',	qw(-10 10 10),	{OUT => [qw(-10 0 10)]}],
+   # ['neg-2',	qw(-.1 .1 .11),	{OUT => [qw(-0.1 0.0 0.1)]}],
+   ['neg-3',	qw(1 -1 0),	{OUT => [qw(1 0)]}],
+   ['neg-4',	qw(1 -1 -1),	{OUT => [qw(1 0 -1)]}],
+
+   ['float-1',	qw(0.8 0.1 0.9),	{OUT => [qw(0.8 0.9)]}],
+   ['float-2',	qw(0.1 0.99 1.99),	{OUT => [qw(0.10 1.09)]}],
+   ['float-3',	qw(10.8 0.1 10.95),	{OUT => [qw(10.8 10.9)]}],
+   ['float-4',	qw(0.1 -0.1 -0.2),	{OUT => [qw(0.1 0.0 -0.1 -0.2)]}],
+   ['float-5',	qw(0.8 1e-1 0.9),	{OUT => [qw(0.8 0.9)]}],
+   ['float-6',	qw(0.8 0.1 0.90000000000000000000),	{OUT => [qw(0.8 0.9)]}],
+
+   ['wid-1',	qw(.8 1e-2 .81),  {OUT => [qw(0.80 0.81)]}],
+   ['wid-2',	qw(.89999 1e-7 .8999901),  {OUT => [qw(0.8999900 0.8999901)]}],
+
+   ['eq-wid-1',	qw(-w 1 -1 -1),	{OUT => [qw(01 00 -1)]}],
+   # Prior to 2.0g, this test would fail on e.g., HPUX systems
+   # because it'd end up using %3.1f as the format instead of %4.1f.
+   ['eq-wid-2',	qw(-w -.1 .1 .11),{OUT => [qw(-0.1 00.0 00.1)]}],
+   ['eq-wid-3',	qw(-w 1 3.0),  {OUT => [qw(1 2 3)]}],
+   ['eq-wid-4',	qw(-w .8 1e-2 .81),  {OUT => [qw(0.80 0.81)]}],
+   ['eq-wid-5',	qw(-w 1 .5 2),  {OUT => [qw(1.0 1.5 2.0)]}],
+   ['eq-wid-6',	qw(-w +1 2),  {OUT => [qw(1 2)]}],
+   ['eq-wid-7',	qw(-w "    .1"  "    .1"),  {OUT => [qw(0.1)]}],
+
+   # Prior to coreutils-4.5.11, some of these were not accepted.
+   ['fmt-1',	qw(-f %2.1f 1.5 .5 2),{OUT => [qw(1.5 2.0)]}],
+   ['fmt-2',	qw(-f %0.1f 1.5 .5 2),{OUT => [qw(1.5 2.0)]}],
+   ['fmt-3',	qw(-f %.1f  1.5 .5 2),{OUT => [qw(1.5 2.0)]}],
+
+   ['fmt-4',	qw(-f %3.0f 1 2),     {OUT => ['  1', '  2']}],
+   ['fmt-5',	qw(-f %-3.0f 1 2),    {OUT => ['1  ', '2  ']}],
+   ['fmt-6',	qw(-f %+3.0f 1 2),    {OUT => [' +1', ' +2']}],
+   ['fmt-7',	qw(-f %0+3.0f 1 2),   {OUT => [qw(+01 +02)]}],
+   ['fmt-8',	qw(-f %0+.0f 1 2),    {OUT => [qw(+1 +2)]}],
+   ['fmt-9',	'-f "% -3.0f"', qw(-1 0), {OUT => ['-1 ', ' 0 ']}],
+   ['fmt-a',	'-f "% -.0f"',qw(-1 0), {OUT => ['-1', ' 0']}],
+  );
+
+# Append a newline to each entry in the OUT array.
+my $t;
+foreach $t (@Tests)
+  {
+    my $e;
+    foreach $e (@$t)
+      {
+	$e->{OUT} = join ("\n", @{$e->{OUT}}) . "\n"
+	  if ref $e eq 'HASH' and exists $e->{OUT};
+      }
+  }
+
+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;
+EOF
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
diff --git a/tests/seq/basic b/tests/seq/basic
deleted file mode 100755
index 843a09e81..000000000
--- a/tests/seq/basic
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-# -*- perl -*-
-# Test "seq".
-
-# Copyright (C) 1999, 2000, 2003, 2005-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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-: ${PERL=perl}
-: ${srcdir=.}
-
-$PERL -e 1 > /dev/null 2>&1 || {
-  echo 1>&2 "$0: configure didn't find a usable version of Perl," \
-    "so can't run this test"
-  exit 77
-}
-
-me=`echo $0|sed 's,.*/,,'`
-exec $PERL -w -I$srcdir/.. -MCoreutils -M"CuTmpdir qw($me)" -- - << \EOF
-require 5.003;
-use strict;
-
-(my $program_name = $0) =~ s|.*/||;
-
-# 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)]}],
-   ['onearg-2',	qw(-1)],
-   ['neg-1',	qw(-10 10 10),	{OUT => [qw(-10 0 10)]}],
-   # ['neg-2',	qw(-.1 .1 .11),	{OUT => [qw(-0.1 0.0 0.1)]}],
-   ['neg-3',	qw(1 -1 0),	{OUT => [qw(1 0)]}],
-   ['neg-4',	qw(1 -1 -1),	{OUT => [qw(1 0 -1)]}],
-
-   ['float-1',	qw(0.8 0.1 0.9),	{OUT => [qw(0.8 0.9)]}],
-   ['float-2',	qw(0.1 0.99 1.99),	{OUT => [qw(0.10 1.09)]}],
-   ['float-3',	qw(10.8 0.1 10.95),	{OUT => [qw(10.8 10.9)]}],
-   ['float-4',	qw(0.1 -0.1 -0.2),	{OUT => [qw(0.1 0.0 -0.1 -0.2)]}],
-   ['float-5',	qw(0.8 1e-1 0.9),	{OUT => [qw(0.8 0.9)]}],
-   ['float-6',	qw(0.8 0.1 0.90000000000000000000),	{OUT => [qw(0.8 0.9)]}],
-
-   ['wid-1',	qw(.8 1e-2 .81),  {OUT => [qw(0.80 0.81)]}],
-   ['wid-2',	qw(.89999 1e-7 .8999901),  {OUT => [qw(0.8999900 0.8999901)]}],
-
-   ['eq-wid-1',	qw(-w 1 -1 -1),	{OUT => [qw(01 00 -1)]}],
-   # Prior to 2.0g, this test would fail on e.g., HPUX systems
-   # because it'd end up using %3.1f as the format instead of %4.1f.
-   ['eq-wid-2',	qw(-w -.1 .1 .11),{OUT => [qw(-0.1 00.0 00.1)]}],
-   ['eq-wid-3',	qw(-w 1 3.0),  {OUT => [qw(1 2 3)]}],
-   ['eq-wid-4',	qw(-w .8 1e-2 .81),  {OUT => [qw(0.80 0.81)]}],
-   ['eq-wid-5',	qw(-w 1 .5 2),  {OUT => [qw(1.0 1.5 2.0)]}],
-   ['eq-wid-6',	qw(-w +1 2),  {OUT => [qw(1 2)]}],
-   ['eq-wid-7',	qw(-w "    .1"  "    .1"),  {OUT => [qw(0.1)]}],
-
-   # Prior to coreutils-4.5.11, some of these were not accepted.
-   ['fmt-1',	qw(-f %2.1f 1.5 .5 2),{OUT => [qw(1.5 2.0)]}],
-   ['fmt-2',	qw(-f %0.1f 1.5 .5 2),{OUT => [qw(1.5 2.0)]}],
-   ['fmt-3',	qw(-f %.1f  1.5 .5 2),{OUT => [qw(1.5 2.0)]}],
-
-   ['fmt-4',	qw(-f %3.0f 1 2),     {OUT => ['  1', '  2']}],
-   ['fmt-5',	qw(-f %-3.0f 1 2),    {OUT => ['1  ', '2  ']}],
-   ['fmt-6',	qw(-f %+3.0f 1 2),    {OUT => [' +1', ' +2']}],
-   ['fmt-7',	qw(-f %0+3.0f 1 2),   {OUT => [qw(+01 +02)]}],
-   ['fmt-8',	qw(-f %0+.0f 1 2),    {OUT => [qw(+1 +2)]}],
-   ['fmt-9',	'-f "% -3.0f"', qw(-1 0), {OUT => ['-1 ', ' 0 ']}],
-   ['fmt-a',	'-f "% -.0f"',qw(-1 0), {OUT => ['-1', ' 0']}],
-  );
-
-# Append a newline to each entry in the OUT array.
-my $t;
-foreach $t (@Tests)
-  {
-    my $e;
-    foreach $e (@$t)
-      {
-	$e->{OUT} = join ("\n", @{$e->{OUT}}) . "\n"
-	  if ref $e eq 'HASH' and exists $e->{OUT};
-      }
-  }
-
-my $save_temps = $ENV{SAVE_TEMPS};
-my $verbose = $ENV{VERBOSE};
-
-my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
-exit $fail;
-EOF
-- 
cgit v1.2.3-70-g09d2