From 47b7234de3600a3777f015ad4792dda622b0a921 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 10 Sep 2007 19:08:31 +0200 Subject: 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. --- tests/unexpand/Makefile.am | 13 ------ tests/unexpand/basic-1 | 101 --------------------------------------------- 2 files changed, 114 deletions(-) delete mode 100644 tests/unexpand/Makefile.am delete mode 100755 tests/unexpand/basic-1 (limited to 'tests/unexpand') 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 diff --git a/tests/unexpand/basic-1 b/tests/unexpand/basic-1 deleted file mode 100755 index 64f4ea66c..000000000 --- a/tests/unexpand/basic-1 +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -# Test "unexpand". - -# Copyright (C) 2000, 2003, 2004, 2005, 2006 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 . - -: ${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 = - ( - ['a1', {IN=> ' 'x 1 ."y\n"}, {OUT=> ' 'x 1 ."y\n"}], - ['a2', {IN=> ' 'x 2 ."y\n"}, {OUT=> ' 'x 2 ."y\n"}], - ['a3', {IN=> ' 'x 3 ."y\n"}, {OUT=> ' 'x 3 ."y\n"}], - ['a4', {IN=> ' 'x 4 ."y\n"}, {OUT=> ' 'x 4 ."y\n"}], - ['a5', {IN=> ' 'x 5 ."y\n"}, {OUT=> ' 'x 5 ."y\n"}], - ['a6', {IN=> ' 'x 6 ."y\n"}, {OUT=> ' 'x 6 ."y\n"}], - ['a7', {IN=> ' 'x 7 ."y\n"}, {OUT=> ' 'x 7 ."y\n"}], - ['a8', {IN=> ' 'x 8 ."y\n"}, {OUT=> "\ty\n"}], - - ['aa-1', '-a', {IN=> 'w'.' 'x 1 ."y\n"}, {OUT=> 'w'.' 'x 1 ."y\n"}], - ['aa-2', '-a', {IN=> 'w'.' 'x 2 ."y\n"}, {OUT=> 'w'.' 'x 2 ."y\n"}], - ['aa-3', '-a', {IN=> 'w'.' 'x 3 ."y\n"}, {OUT=> 'w'.' 'x 3 ."y\n"}], - ['aa-4', '-a', {IN=> 'w'.' 'x 4 ."y\n"}, {OUT=> 'w'.' 'x 4 ."y\n"}], - ['aa-5', '-a', {IN=> 'w'.' 'x 5 ."y\n"}, {OUT=> 'w'.' 'x 5 ."y\n"}], - ['aa-6', '-a', {IN=> 'w'.' 'x 6 ."y\n"}, {OUT=> 'w'.' 'x 6 ."y\n"}], - ['aa-7', '-a', {IN=> 'w'.' 'x 7 ."y\n"}, {OUT=> "w\ty\n"}], - ['aa-8', '-a', {IN=> 'w'.' 'x 8 ."y\n"}, {OUT=> "w\t y\n"}], - - ['b-1', '-t', '2,4', {IN=> " ."}, {OUT=>"\t\t ."}], - # These would infloop prior to textutils-2.0d. - - ['infloop-1', '-t', '1,2', {IN=> " \t\t .\n"}, {OUT=>"\t\t\t .\n"}], - ['infloop-2', '-t', '4,5', {IN=> ' 'x4 . "\t\t \n"}, {OUT=>"\t\t\t \n"}], - ['infloop-3', '-t', '2,3', {IN=> "x \t\t \n"}, {OUT=>"x \t\t \n"}], - ['infloop-4', '-t', '1,2', {IN=> " \t\t \n"}, {OUT=>"\t\t\t \n"}], - ['c-1', '-t', '1,2', {IN=> "x\t\t .\n"}, {OUT=>"x\t\t .\n"}], - - # -t implies -a - # Feature addition (--first-only) prompted by a report from Jie Xu. - ['tabs-1', qw(-t 3), {IN=> " a b\n"}, {OUT=>"\ta\tb\n"}], - ['tabs-2', qw(-t 3 --first-only), {IN=> " a b\n"}, {OUT=>"\ta b\n"}], - - # blanks - ['blanks-1', qw(-t 1), {IN=> " b c d\n"}, {OUT=> "\tb\t\tc\t\t\td\n"}], - ['blanks-2', qw(-t 1), {IN=> "a \n"}, {OUT=> "a \n"}], - ['blanks-3', qw(-t 1), {IN=> "a \n"}, {OUT=> "a\t\t\n"}], - ['blanks-4', qw(-t 1), {IN=> "a \n"}, {OUT=> "a\t\t\t\n"}], - ['blanks-5', qw(-t 1), {IN=> "a "}, {OUT=> "a "}], - ['blanks-6', qw(-t 1), {IN=> "a "}, {OUT=> "a\t\t"}], - ['blanks-7', qw(-t 1), {IN=> "a "}, {OUT=> "a\t\t\t"}], - ['blanks-8', qw(-t 1), {IN=> " a a a\n"}, {OUT=> "\ta a\t\ta\n"}], - ['blanks-9', qw(-t 2), {IN=> " a a a\n"}, {OUT=> "\t a\ta a\n"}], - ['blanks-10', '-t', '3,4', {IN=> "0 2 4 6\t8\n"}, {OUT=> "0 2 4 6\t8\n"}], - ['blanks-11', '-t', '3,4', {IN=> " 4\n"}, {OUT=> "\t\t4\n"}], - ['blanks-12', '-t', '3,4', {IN=> "01 4\n"}, {OUT=> "01\t\t4\n"}], - ['blanks-13', '-t', '3,4', {IN=> "0 4\n"}, {OUT=> "0\t\t4\n"}], - - # It is debatable whether this test should require an environment - # setting of e.g., _POSIX2_VERSION=1. - ['obs-ovflo', '-18446744073709551617', {IN=>''}, {OUT=>''}, - {EXIT => 1}, {ERR => "$prog: tab stop value is too large\n"}], - ); - -my $save_temps = $ENV{DEBUG}; -my $verbose = $ENV{VERBOSE}; - -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); -exit $fail; -EOF -- cgit v1.2.3-54-g00ecf