From c83c48411dc7feb8c72b08f918320739940c3a9d Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
Date: Wed, 24 Oct 2012 23:18:23 +0100
Subject: maint: refactor tests/misc/pr.pl into tests/pr/pr-tests.pl

* tests/misc/pr.pl: Refactor this test into ...
* tests/pr/pr-tests.pl: ... here.
* tests/local.mk: Remove the reference to the removed test
Improved by Jim Meyering
---
 tests/local.mk       |  1 -
 tests/misc/pr.pl     | 43 -------------------------------------------
 tests/pr/pr-tests.pl |  8 ++++++++
 3 files changed, 8 insertions(+), 44 deletions(-)
 delete mode 100755 tests/misc/pr.pl

diff --git a/tests/local.mk b/tests/local.mk
index 5a237fa71..f31c8b0d2 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -240,7 +240,6 @@ all_tests =					\
   tests/misc/od-float.sh			\
   tests/misc/mktemp.pl				\
   tests/misc/arch.sh				\
-  tests/misc/pr.pl				\
   tests/misc/join.pl				\
   tests/pr/pr-tests.pl				\
   tests/misc/pwd-option.sh			\
diff --git a/tests/misc/pr.pl b/tests/misc/pr.pl
deleted file mode 100755
index 0f25e2531..000000000
--- a/tests/misc/pr.pl
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/perl
-# Exercise a bug with pr -m -s
-
-# Copyright (C) 2007-2012 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/>.
-
-use strict;
-
-(my $program_name = $0) =~ s|.*/||;
-
-$ENV{PROG} = 'pr';
-my $ME = $ENV{PROG};
-
-# Turn off localization of executable's output.
-@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
-
-my @Tests =
-  (
-   ['merge-w-tabs', '-m -s -t',
-    {IN=>{1=>"a\tb\tc\n"}},
-    {IN=>{2=>"m\tn\to\n"}},
-    {IN=>{3=>"x\ty\tz\n"}},
-     {OUT=>join("\t", qw(a b c m n o x y z)) . "\n"} ],
-  );
-
-my $save_temps = $ENV{DEBUG};
-my $verbose = $ENV{VERBOSE};
-
-my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
-my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
-exit $fail;
diff --git a/tests/pr/pr-tests.pl b/tests/pr/pr-tests.pl
index f20241426..d06b34f8f 100755
--- a/tests/pr/pr-tests.pl
+++ b/tests/pr/pr-tests.pl
@@ -451,6 +451,14 @@ foreach my $t (@tv)
     push @Tests, $new_ent;
   }
 
+# Exercise a bug with pr -m -s (commit 553d347)
+push @Tests,
+   ['merge-w-tabs', '-m -s -t',
+    {IN=>{1=>"a\tb\tc\n"}},
+    {IN=>{2=>"m\tn\to\n"}},
+    {IN=>{3=>"x\ty\tz\n"}},
+     {OUT=>join("\t", qw(a b c m n o x y z)) . "\n"} ];
+
 @Tests = triple_test \@Tests;
 
 my $save_temps = $ENV{DEBUG};
-- 
cgit v1.2.3-54-g00ecf