From: Akim Demaille Date: Mon, 20 May 2002 13:27:55 +0000 (+0000) Subject: Remove. X-Git-Tag: AUTOCONF-2.53b~71 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44bc4451264c8eb34ddf467b7836fb83a3ee38d0;p=thirdparty%2Fautoconf.git Remove. --- diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4 deleted file mode 100644 index 99d05f389..000000000 --- a/tests/atgeneral.m4 +++ /dev/null @@ -1,594 +0,0 @@ -include(m4sh.m4) -*- Autoconf -*- -# M4 macros used in building test suites. -# Copyright (C) 2000, 2001, 2002 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 2, 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, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# This script is part of Autotest. Unlimited permission to copy, -# distribute and modify the testing scripts that are the output of -# that Autotest script is given. You need not follow the terms of the -# GNU General Public License when using or distributing such scripts, -# even though portions of the text of Autotest appear in them. The -# GNU General Public License (GPL) does govern all other use of the -# material that constitutes the Autotest. -# -# Certain portions of the Autotest source text are designed to be -# copied (in certain cases, depending on the input) into the output of -# Autotest. We call these the "data" portions. The rest of the -# Autotest source text consists of comments plus executable code that -# decides which of the data portions to output in any given case. We -# call these comments and executable code the "non-data" portions. -# Autotest never copies any of the non-data portions into its output. -# -# This special exception to the GPL applies to versions of Autotest -# released by the Free Software Foundation. When you make and -# distribute a modified version of Autotest, you may extend this -# special exception to the GPL to apply to your modified version as -# well, *unless* your modified version has the potential to copy into -# its output some of the text that was the non-data portion of the -# version that you started with. (In other words, unless your change -# moves or copies text from the non-data portions to the data -# portions.) If your modification has such potential, you must delete -# any notice of this special exception to the GPL from your modified -# version. - - -# Use of diversions: -# -# - DEFAULT -# Overall initialization, value of $at_tests_all. -# - OPTIONS -# Option processing -# - HELP -# Help message. Of course it is useless, you could just push into -# OPTIONS, but that's much clearer this way. -# - SETUP -# Be ready to run the tests. -# - TESTS -# The core of the test suite, the ``normal'' diversion. -# - TAIL -# tail of the core for;case, overall wrap up, generation of debugging -# scripts and statistics. - -m4_define([_m4_divert(DEFAULT)], 0) -m4_define([_m4_divert(OPTIONS)], 10) -m4_define([_m4_divert(HELP)], 20) -m4_define([_m4_divert(SETUP)], 30) -m4_define([_m4_divert(TESTS)], 50) -m4_define([_m4_divert(TAIL)], 60) - -m4_divert_push([TESTS]) -m4_divert_push([KILL]) - - -# AT_LINE -# ------- -# Return the current file sans directory, a colon, and the current line. -m4_define([AT_LINE], -[m4_patsubst(__file__, ^.*/\(.*\), \1):__line__]) - - -# AT_INIT(PROGRAM) -# ---------------- -# Begin test suite, using PROGRAM to check version. The search path -# should be already preset so the proper executable will be selected. -m4_define([AT_INIT], -[m4_define([AT_ordinal], 0) -m4_define([AT_banner_ordinal], 0) -m4_define([AT_data_files], - [stdout expout at-setup-line at-check-line at-stdout stderr experr - at-stder1 at-stderr ]) -m4_divert_push([DEFAULT])dnl -#! /bin/sh - -AS_SHELL_SANITIZE -SHELL=${CONFIG_SHELL-/bin/sh} - -. ./atconfig -# Use absolute file notations, as the test might change directories. -at_srcdir=`cd "$srcdir" && pwd` -at_top_srcdir=`cd "$top_srcdir" && pwd` - -# Don't take risks: use absolute path names. -at_path=`pwd` -at_IFS_save=$IFS -IFS=$PATH_SEPARATOR -for at_dir in $AUTOTEST_PATH $PATH; do - # There might be directories that don't exist, but don't redirect - # builtins' (eg., cd) stderr directly: Ultrix's sh hates that. - at_dir=`(cd "$at_dir" && pwd) 2>/dev/null` - test -n "$at_dir" && at_path="$at_path$PATH_SEPARATOR$at_dir" -done -IFS=$at_IFS_save -PATH=$at_path -export PATH - -test -f atlocal && . ./atlocal - -# -e sets to true -at_stop_on_error=false -# Shall we be verbose? -at_verbose=: -at_quiet=echo -# Shall we keep the debug scripts? Must be `:' when testsuite is -# run by a debug script, so that the script doesn't remove itself. -at_debug=false -# Display help message? -at_help=false -# Tests to run -at_tests= -dnl Other vars inserted here (DEFAULT). -m4_divert([OPTIONS]) - -while test $[#] -gt 0; do - case $[1] in - --help | -h) at_help=: ;; - --version) echo "$[0] ($at_package) $at_version"; exit 0 ;; - - -d) at_debug=:;; - -e) at_stop_on_error=:;; - -v) at_verbose=echo; at_quiet=:;; - -x) at_traceon='set -vx'; at_traceoff='set +vx';; - - [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]]) - at_tests="$at_tests$[1] ";; - - # Ranges - [[0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-]) - at_range_start=`echo $[1] |tr -d '-'` - at_range=`echo " $at_tests_all " | \ - sed -e 's,^.* '$at_range_start' ,'$at_range_start' ,'` - at_tests="$at_tests$at_range ";; - - [-[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9]]) - at_range_end=`echo $[1] |tr -d '-'` - at_range=`echo " $at_tests_all " | \ - sed -e 's, '$at_range_end' .*$, '$at_range_end','` - at_tests="$at_tests$at_range ";; - - [[0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9]] | \ - [[0-9]-[0-9][0-9][0-9][0-9] | [0-9][0-9]-[0-9][0-9]] | \ - [[0-9][0-9]-[0-9][0-9][0-9] | [0-9][0-9]-[0-9][0-9][0-9][0-9]] | \ - [[0-9][0-9][0-9]-[0-9][0-9][0-9]] | \ - [[0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]] | \ - [[0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]] ) - at_range_start=`echo $[1] |sed 's,-.*,,'` - at_range_end=`echo $[1] |sed 's,.*-,,'` - # Maybe test to make sure start <= end - at_range=`echo " $at_tests_all " | \ - sed -e 's,^.* '$at_range_start' ,'$at_range_start' ,' \ - -e 's, '$at_range_end' .*$, '$at_range_end','` - at_tests="$at_tests$at_range ";; - - *) echo "$as_me: invalid option: $[1]" >&2 - echo "Try \`$[0] --help' for more information." >&2 - exit 1 ;; - esac - shift -done - -# Help message. -if $at_help; then - # If tests were specified, display only their title. - if test -z "$at_tests"; then - cat < " (1|42|45): " - at_tests_pattern=`echo "$at_tests" | sed 's/^ *//;s/ *$//;s/ */|/g'` - at_tests_pattern=" (${at_tests_pattern}): " - fi - egrep -e "$at_tests_pattern" </dev/null 2>&1; then - at_devnull=/dev/null -else - at_devnull=at-devnull - cp /dev/null $at_devnull -fi - -# Use `diff -u' when possible. -if diff -u $at_devnull $at_devnull >/dev/null 2>&1; then - at_diff='diff -u' -else - at_diff=diff -fi - -# Tester and tested. -if $1 --version | grep "$at_package.*$at_version" >/dev/null; then - AS_BOX([Test suite for $at_package $at_version]) -else - AS_BOX([ERROR: Not using the proper version, no tests performed]) - exit 1 -fi - -# Setting up the FDs. -# 5 is stdout conditioned by verbosity. -if test $at_verbose = echo; then - exec 5>&1 -else - exec 5>/dev/null -fi - -at_fail_list= -at_skip_list= -at_test_count=0 -m4_divert([TESTS])dnl - -for at_test in $at_tests -do - at_status=0 - rm -rf $at_data_files - # Clearly separate the tests when verbose. - test $at_test_count != 0 && $at_verbose - case $at_test in -dnl Tests inserted here (TESTS). -m4_divert([TAIL])[]dnl - - * ) - echo $as_me: no such test: $at_test - continue - ;; - esac - case $at_test in - banner-*) ;; - *) - if test ! -f at-check-line; then - echo "$as_me: warning: no at-check-line which means a failure happened" - echo "$as_me: warning: in a [AT_SETUP/AT_CLEANUP] pair before any" - echo "$as_me: warning: [AT_CHECK] could be run. This test suite is" - echo "$as_me: warning: improperly designed, please report to" - echo "$as_me: warning: <$at_bugreport>." - cp at-setup-line at-check-line - fi - at_test_count=`expr 1 + $at_test_count` - $at_verbose $at_n "$at_test. $srcdir/`cat at-setup-line`: $at_c" - case $at_status in - 0) echo ok - ;; - 77) echo "ok (skipped near \``cat at-check-line`')" - at_skip_list="$at_skip_list $at_test" - ;; - *) echo "FAILED near \``cat at-check-line`'" - at_fail_list="$at_fail_list $at_test" - $at_stop_on_error && break - ;; - esac - $at_debug || rm -rf $at_data_files - ;; - esac -done - -# Wrap up the test suite with summary statistics. - -rm -f at-check-line at-setup-line -at_skip_count=`set dummy $at_skip_list; shift; echo $[#]` -at_fail_count=`set dummy $at_fail_list; shift; echo $[#]` -if test $at_fail_count = 0; then - if test $at_skip_count = 0; then - AS_BOX([All $at_test_count tests were successful]) - else - AS_BOX([All $at_test_count tests were successful ($at_skip_count skipped)]) - fi -elif test $at_debug = false; then - if $at_stop_on_error; then - AS_BOX([ERROR: One of the tests failed, inhibiting subsequent tests]) - else - AS_BOX([ERROR: Suite unsuccessful, $at_fail_count of $at_test_count tests failed]) - fi - - # Remove any debugging script resulting from a previous run. - rm -f debug-*.sh $[0].log - echo - echo $at_n "Writing \`debug-NN.sh' scripts, NN =$at_c" - for at_group in $at_fail_list; do - echo $at_n " $at_group$at_c" - ( echo "#! /bin/sh" - echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"$[@]"}'\''='\''"$[@]"'\''' - echo 'exec ${CONFIG_SHELL-'"$SHELL"'} '"$[0]"' -v -d '"$at_group"' ${1+"$[@]"}' - echo 'exit 1' - ) >debug-$at_group.sh - chmod +x debug-$at_group.sh - done - echo ', done' - echo - echo 'You may investigate any problem if you feel able to do so, in which' - echo 'case the test suite provides a good starting point.' - echo - echo 'Now, failed tests will be executed again, verbosely, and logged' - echo 'in the file '$[0]'.log.' - - { - AS_BOX([Test suite log for $at_package $at_version]) - echo - - # Try to find a few ChangeLogs in case it might help determining the - # exact version. - find "$at_top_srcdir" -name ChangeLog \ - -exec echo {} : ';' \ - -exec sed 's/^/| /;10q' {} ';' \ - -exec echo ';' - - # Summary of failed and skipped tests. - if test $at_fail_count != 0; then - echo "Failed tests:" - $SHELL $[0] $at_fail_list --help - echo - fi - if test $at_skip_count != 0; then - echo "Skipped tests:" - $SHELL $[0] $at_skip_list --help - echo - fi - - AS_UNAME - } >>$[0].log - - $SHELL $[0] -v -d $at_fail_list 2>&1 | tee -a $[0].log - AS_BOX([$[0].log is created]) - - echo - echo "Please send \`$[0].log' to <$at_bugreport> together with all" - echo "the information you think might help." - exit 1 -fi - -exit 0 -m4_divert_pop()dnl -m4_wrap([m4_divert_text([DEFAULT], - [# List of the tests. -at_tests_all="AT_TESTS_ALL "])])dnl -m4_wrap([m4_divert_text([SETUP], - [# List of the output files. -at_data_files="AT_data_files "])])dnl -])# AT_INIT - - - -# AT_SETUP(DESCRIPTION) -# --------------------- -# Start a group of related tests, all to be executed in the same subshell. -# The group is testing what DESCRIPTION says. -m4_define([AT_SETUP], -[m4_define([AT_ordinal], m4_incr(AT_ordinal)) -m4_append([AT_TESTS_ALL], [ ]m4_defn([AT_ordinal])) -m4_divert_text([HELP], - [m4_format([ %3d: %-15s %s], AT_ordinal, AT_LINE, [$1])]) -m4_divert_push([TESTS])dnl - AT_ordinal ) [#] AT_ordinal. AT_LINE: $1 - echo AT_LINE >at-setup-line - $at_verbose "AT_ordinal. $srcdir/AT_LINE: testing $1..." - $at_quiet $at_n "m4_format([%3d: %-18s], AT_ordinal, AT_LINE)[]$at_c" - ( - $at_traceon -]) - - -# AT_CLEANUP_FILE_IFELSE(FILE, IF-REGISTERED, IF-NOT-REGISTERED) -# -------------------------------------------------------------- -# We try to build a regular expression matching `[', `]', `*', and -# `.', i.e., the regexp active characters. -# -# Novices would write `[[]*.]', which fails since the character -# class ends with the first closing bracket. -# M4 gurus would write `[\[\]*.]', but it will fail too because -# regexp does not support this and understands `\' per se. -# Regexp gurus will write `[][*.]' which is indeed what Regexp expects, -# but it will fail for M4 reasons: it's the same as `[*.]'. -# -# So the question is: -# -# Can you write a regexp that matches those four characters, -# and respects the M4 quotation constraints? -# -# The answer is: (rot13) tvira va gur ertrkc orybj, lbh vqvbg! -m4_define([AT_CLEANUP_FILE_IFELSE], -[m4_if(m4_regexp(AT_data_files, m4_patsubst([ $1 ], [[[]\|[]]\|[*.]], [\\\&])), - -1, - [$3], [$2])]) - - -# AT_CLEANUP_FILE(FILE) -# --------------------- -# Register FILE for AT_CLEANUP. -m4_define([AT_CLEANUP_FILE], -[AT_CLEANUP_FILE_IFELSE([$1], [], - [m4_append([AT_data_files], [$1 ])])]) - - -# AT_CLEANUP_FILES(FILES) -# ----------------------- -# Declare a list of FILES to clean. -m4_define([AT_CLEANUP_FILES], -[m4_foreach([AT_File], m4_quote(m4_patsubst([$1], [ *], [,])), - [AT_CLEANUP_FILE(AT_File)])]) - - -# AT_CLEANUP(FILES) -# ----------------- -# Complete a group of related tests, recursively remove those FILES -# created within the test. There is no need to list files created with -# AT_DATA. -m4_define([AT_CLEANUP], -[AT_CLEANUP_FILES([$1])dnl - ) - at_status=$? - ;; - -m4_divert([TESTS])[]dnl -m4_divert_pop()dnl -])# AT_CLEANUP - - -# AT_BANNER(TEXT) -# --------------- -# Output TEXT without any shell expansion. -m4_define([AT_BANNER], -[m4_define([AT_banner_ordinal], m4_incr(AT_banner_ordinal)) -m4_append([AT_TESTS_ALL], [ banner-]m4_defn([AT_banner_ordinal])) -m4_divert_push([TESTS])dnl - banner-AT_banner_ordinal ) [#] Banner AT_banner_ordinal. AT_LINE - cat <<\_ATEOF - -$1 - -_ATEOF - ;; - -m4_divert_pop()dnl -])# AT_BANNER - - -# AT_DATA(FILE, CONTENTS) -# ----------------------- -# Initialize an input data FILE with given CONTENTS, which should end with -# an end of line. -# This macro is not robust to active symbols in CONTENTS *on purpose*. -# If you don't want CONTENT to be evaluated, quote it twice. -m4_define([AT_DATA], -[AT_CLEANUP_FILES([$1])dnl -cat >$1 <<'_ATEOF' -$2[]_ATEOF -]) - - -# AT_CHECK(COMMANDS, [STATUS = 0], STDOUT, STDERR) -# ------------------------------------------------ -# Execute a test by performing given shell COMMANDS. These commands -# should normally exit with STATUS, while producing expected STDOUT and -# STDERR contents. -# -# STATUS, STDOUT, and STDERR are not checked if equal to `ignore'. -# -# If STDOUT is `expout', then stdout is compared to the content of the file -# `expout'. Likewise for STDERR and `experr'. -# -# If STDOUT is `stdout', then the stdout is left in the file `stdout', -# likewise for STDERR and `stderr'. Don't do this: -# -# AT_CHECK([command >out]) -# # Some checks on `out' -# -# do this instead: -# -# AT_CHECK([command], [], [stdout]) -# # Some checks on `stdout' -# -# This is an unfortunate limitation inherited from Ultrix which will not -# let you redirect several times the same FD (see the Autoconf documentation). -# If you use the `AT_CHECK([command >out])' be sure to have the test -# suite introduces spurious failures. -# -# You might wander why not just use `ignore' and directly use stdout and -# stderr left by the test suite. Firstly because the names of these files -# is an internal detail, and secondly, because -# -# AT_CHECK([command], [], [ignore]) -# AT_CHECK([check stdout]) -# -# will use `stdout' both in input and output: undefined behavior would -# certainly result. That's why the test suite will save them in `at-stdout' -# and `at-stderr', and will provide you with `stdout' and `stderr'. -# -# Any line of stderr starting with leading blanks and a `+' are filtered -# out, since most shells when tracing include subshell traces in stderr. -# This may cause spurious failures when the test suite is run with `-x'. -# -# -# Implementation Details -# ---------------------- -# Ideally, we would like to run -# -# ( $at_traceon; COMMANDS >at-stdout 2> at-stderr ) -# -# but we must group COMMANDS as it is not limited to a single command, and -# then the shells will save the traces in at-stderr. So we have to filter -# them out when checking stderr, and we must send them into the test suite's -# stderr to honor -x properly. -# -# Limiting COMMANDS to a single command is not good either, since them -# the user herself would use {} or (), and then we face the same problem. -# -# But then, there is no point in running -# -# ( $at_traceon { $1 ; } >at-stdout 2>at-stder1 ) -# -# instead of the simpler -# -# ( $at_traceon; $1 ) >at-stdout 2>at-stder1 -# -m4_define([AT_CHECK], -[$at_traceoff -$at_verbose "$srcdir/AT_LINE: AS_ESCAPE([$1])" -echo AT_LINE >at-check-line -( $at_traceon; $1 ) >at-stdout 2>at-stder1 -at_status=$? -egrep '^ *\+' at-stder1 >&2 -egrep -v '^ *\+' at-stder1 >at-stderr -at_failed=false -dnl Check stderr. -m4_case([$4], - stderr, [(echo stderr:; tee stderr &5], - ignore, [(echo stderr:; cat at-stderr) >&5], - experr, [$at_diff experr at-stderr >&5 || at_failed=:], - [], [$at_diff $at_devnull at-stderr >&5 || at_failed=:], - [echo >>at-stderr; echo "AS_ESCAPE([$4])" | $at_diff - at-stderr >&5 || at_failed=:]) -dnl Check stdout. -m4_case([$3], - stdout, [(echo stdout:; tee stdout &5], - ignore, [(echo stdout:; cat at-stdout) >&5], - expout, [$at_diff expout at-stdout >&5 || at_failed=:], - [], [$at_diff $at_devnull at-stdout >&5 || at_failed=:], - [echo >>at-stdout; echo "AS_ESCAPE([$3])" | $at_diff - at-stdout >&5 || at_failed=:]) -dnl Check exit val. Don't `skip' if we are precisely checking $? = 77. -case $at_status in -m4_case([$2], - [77], - [], - [ 77) exit 77;; -])dnl -m4_case([$2], - [ignore], - [ *);;], - [ m4_default([$2], [0])) ;; - *) $at_verbose "$srcdir/AT_LINE: exit code was $at_status, expected m4_default([$2], [0])" >&2 - at_failed=:;;]) -esac -AS_IF($at_failed, [$5], [$6]) -$at_failed && exit 1 -$at_traceon -])# AT_CHECK diff --git a/tests/autoreconf.in b/tests/autoreconf.in deleted file mode 100644 index 192c22705..000000000 --- a/tests/autoreconf.in +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/sh -# Running `$0' as if it were installed. - -me=`echo "$0" | sed -e 's,.*[\\/],,'` - -exec @abs_top_builddir@/bin/$me --autoconf-dir @abs_top_builddir@/lib ${1+"$@"}