From 18b3231bbfdb1fe36c08511bda930588cc836c71 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 7 Sep 2007 14:34:37 +0200 Subject: Move the sole test in tests/dircolors to tests/misc/dircolors. * tests/dircolors/simple: Move this file to... * tests/misc/dircolors: ...here. Don't rely on $PROG in env. * tests/misc/Makefile.am (TESTS): Add dircolors. * tests/Makefile.am (SUBDIRS): Remove dircolors. * tests/dircolors: Remove the directory. * configure.ac (AC_CONFIG_FILES): Remove tests/dircolors/Makefile --- configure.ac | 1 - tests/Makefile.am | 2 +- tests/dircolors/Makefile.am | 13 ---------- tests/dircolors/simple | 59 --------------------------------------------- tests/misc/Makefile.am | 1 + tests/misc/dircolors | 59 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 61 insertions(+), 74 deletions(-) delete mode 100644 tests/dircolors/Makefile.am delete mode 100755 tests/dircolors/simple create mode 100755 tests/misc/dircolors diff --git a/configure.ac b/configure.ac index df9b2a8af..c488f0d8a 100644 --- a/configure.ac +++ b/configure.ac @@ -342,7 +342,6 @@ AC_CONFIG_FILES( tests/cp/Makefile tests/cut/Makefile tests/dd/Makefile - tests/dircolors/Makefile tests/du/Makefile tests/expr/Makefile tests/factor/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index 5d91f5956..2d57bfcf5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -44,7 +44,7 @@ EXTRA_DIST = \ ## N O T E :: Please do not add new tests/ directories. ## There are too many already. Put new tests in misc/. SUBDIRS = \ - chgrp chmod chown cp cut dd dircolors du expr factor fmt head \ + chgrp chmod chown cp cut dd du expr factor fmt head \ install join ln ls ls-2 md5sum misc mkdir mv od pr readlink rm rmdir \ seq sha1sum shred sort stty sum tac tail tail-2 tee test touch tr \ tsort unexpand uniq wc diff --git a/tests/dircolors/Makefile.am b/tests/dircolors/Makefile.am deleted file mode 100644 index 41e754e69..000000000 --- a/tests/dircolors/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=dircolors - -TESTS = simple diff --git a/tests/dircolors/simple b/tests/dircolors/simple deleted file mode 100755 index 2db796192..000000000 --- a/tests/dircolors/simple +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# Simple dircolors tests. - -# Copyright (C) 1998, 2003, 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 @Tests = - ( - ['a', '-b', {IN => {k => "exec\n"}}, - {ERR => "dircolors: k:1: invalid line; missing second token\n"}, - {EXIT => 1}], - ['quote', '-b', {IN => "exec 'echo Hello;:'\n"}, - {OUT => "LS_COLORS='ex='\\''echo Hello;\\:'\\'':';\n" - . "export LS_COLORS\n"}], - ['other-wr', '-b', {IN => "owt 40;33\n"}, - {OUT => "LS_COLORS='tw=40;33:';\nexport LS_COLORS\n"}], - - # CAREFUL: always specify the -b option, unless explicitly testing - # for csh syntax output. - ); - -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; -EOF diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am index 98951d8dd..9555636f9 100644 --- a/tests/misc/Makefile.am +++ b/tests/misc/Makefile.am @@ -62,6 +62,7 @@ TESTS = \ close-stdout \ csplit \ date-sec \ + dircolors \ df \ dirname \ expand \ diff --git a/tests/misc/dircolors b/tests/misc/dircolors new file mode 100755 index 000000000..e93d2fb7d --- /dev/null +++ b/tests/misc/dircolors @@ -0,0 +1,59 @@ +#!/bin/sh +# Simple dircolors tests. + +# Copyright (C) 1998, 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 . + +: ${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 = + ( + ['a', '-b', {IN => {k => "exec\n"}}, + {ERR => "dircolors: k:1: invalid line; missing second token\n"}, + {EXIT => 1}], + ['quote', '-b', {IN => "exec 'echo Hello;:'\n"}, + {OUT => "LS_COLORS='ex='\\''echo Hello;\\:'\\'':';\n" + . "export LS_COLORS\n"}], + ['other-wr', '-b', {IN => "owt 40;33\n"}, + {OUT => "LS_COLORS='tw=40;33:';\nexport LS_COLORS\n"}], + + # CAREFUL: always specify the -b option, unless explicitly testing + # for csh syntax output. + ); + +my $save_temps = $ENV{DEBUG}; +my $verbose = $ENV{VERBOSE}; + +my $prog = 'dircolors'; +my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +exit $fail; +EOF -- cgit v1.2.3-70-g09d2