* tests/ansi.test: Delete. * tests/ansi10.test: Likewise. * tests/ansi2.test: Likewise. * tests/ansi2knr-deprecation.test: Likewise. * tests/ansi3.test: Likewise. * tests/ansi3b.test: Likewise. * tests/ansi4.test: Likewise. * tests/ansi5.test: Likewise. * tests/ansi6.test: Likewise. * tests/ansi7.test: Likewise. * tests/ansi8.test: Likewise. * tests/ansi9.test: Likewise. * tests/cxxansi.test: Likewise. * tests/libobj8.test: Likewise. * tests/subobj3.test: Likewise. * tests/Makefile.am (TESTS): Update. --- ChangeLog | 20 +++++++++ tests/Makefile.am | 15 ------- tests/Makefile.in | 15 ------- tests/ansi.test | 51 ---------------------- tests/ansi10.test | 72 ------------------------------- tests/ansi2.test | 38 ---------------- tests/ansi2knr-deprecation.test | 69 ------------------------------ tests/ansi3.test | 58 ------------------------- tests/ansi3b.test | 59 -------------------------- tests/ansi4.test | 40 ----------------- tests/ansi5.test | 89 --------------------------------------- tests/ansi6.test | 83 ------------------------------------ tests/ansi7.test | 85 ------------------------------------- tests/ansi8.test | 28 ------------ tests/ansi9.test | 60 -------------------------- tests/cxxansi.test | 45 -------------------- tests/libobj8.test | 51 ---------------------- tests/subobj3.test | 66 ----------------------------- 18 files changed, 20 insertions(+), 924 deletions(-) delete mode 100755 tests/ansi.test delete mode 100755 tests/ansi10.test delete mode 100755 tests/ansi2.test delete mode 100755 tests/ansi2knr-deprecation.test delete mode 100755 tests/ansi3.test delete mode 100755 tests/ansi3b.test delete mode 100755 tests/ansi4.test delete mode 100755 tests/ansi5.test delete mode 100755 tests/ansi6.test delete mode 100755 tests/ansi7.test delete mode 100755 tests/ansi8.test delete mode 100755 tests/ansi9.test delete mode 100755 tests/cxxansi.test delete mode 100755 tests/libobj8.test delete mode 100755 tests/subobj3.test
diff --git a/ChangeLog b/ChangeLog index 819601e..f9a509f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,25 @@ 2011-08-28 Stefano Lattarini <stefano.lattar...@gmail.com> + tests: remove tests about obsolete de-ANSI-fication support + * tests/ansi.test: Delete. + * tests/ansi10.test: Likewise. + * tests/ansi2.test: Likewise. + * tests/ansi2knr-deprecation.test: Likewise. + * tests/ansi3.test: Likewise. + * tests/ansi3b.test: Likewise. + * tests/ansi4.test: Likewise. + * tests/ansi5.test: Likewise. + * tests/ansi6.test: Likewise. + * tests/ansi7.test: Likewise. + * tests/ansi8.test: Likewise. + * tests/ansi9.test: Likewise. + * tests/cxxansi.test: Likewise. + * tests/libobj8.test: Likewise. + * tests/subobj3.test: Likewise. + * tests/Makefile.am (TESTS): Update. + +2011-08-28 Stefano Lattarini <stefano.lattar...@gmail.com> + docs: remove description of de-ANSI-fication support from manual * doc/automake.texi (Auxiliary Programs): Remove mention of `ansi2knr.c' and `ansi2knr.1'. diff --git a/tests/Makefile.am b/tests/Makefile.am index a194f44..128ee06 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -154,18 +154,6 @@ amopt.test \ amopts-location.test \ amopts-variable-expansion.test \ amsubst.test \ -ansi2knr-deprecation.test \ -ansi.test \ -ansi2.test \ -ansi3.test \ -ansi3b.test \ -ansi4.test \ -ansi5.test \ -ansi6.test \ -ansi7.test \ -ansi8.test \ -ansi9.test \ -ansi10.test \ ar-lib.test \ ar.test \ ar2.test \ @@ -355,7 +343,6 @@ cscope2.test \ cscope3.test \ cxx.test \ cxx2.test \ -cxxansi.test \ cxxcpp.test \ cxxlibobj.test \ cxxlink.test \ @@ -568,7 +555,6 @@ libobj3.test \ libobj4.test \ libobj5.test \ libobj7.test \ -libobj8.test \ libobj10.test \ libobj12.test \ libobj13.test \ @@ -924,7 +910,6 @@ subcond2.test \ subcond3.test \ subobj.test \ subobj2.test \ -subobj3.test \ subobj4.test \ subobj5.test \ subobj6.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 7fe2c93..e0d2ac3 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -427,18 +427,6 @@ amopt.test \ amopts-location.test \ amopts-variable-expansion.test \ amsubst.test \ -ansi2knr-deprecation.test \ -ansi.test \ -ansi2.test \ -ansi3.test \ -ansi3b.test \ -ansi4.test \ -ansi5.test \ -ansi6.test \ -ansi7.test \ -ansi8.test \ -ansi9.test \ -ansi10.test \ ar-lib.test \ ar.test \ ar2.test \ @@ -628,7 +616,6 @@ cscope2.test \ cscope3.test \ cxx.test \ cxx2.test \ -cxxansi.test \ cxxcpp.test \ cxxlibobj.test \ cxxlink.test \ @@ -841,7 +828,6 @@ libobj3.test \ libobj4.test \ libobj5.test \ libobj7.test \ -libobj8.test \ libobj10.test \ libobj12.test \ libobj13.test \ @@ -1197,7 +1183,6 @@ subcond2.test \ subcond3.test \ subobj.test \ subobj2.test \ -subobj3.test \ subobj4.test \ subobj5.test \ subobj6.test \ diff --git a/tests/ansi.test b/tests/ansi.test deleted file mode 100755 index fa79a8c..0000000 --- a/tests/ansi.test +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/sh -# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2010, 2011 -# 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, see <http://www.gnu.org/licenses/>. - -# Test for bug where ansi2knr.c is not included in distribution. -# From Fran�ois Pinard. - -. ./defs || Exit 1 - -cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = ansi2knr -.PHONY: test1 test2 -test1: - echo ' $(DISTFILES) ' | grep ' ansi2knr\.c ' - echo ' $(DISTFILES) ' | grep ' ansi2knr\.1 ' -test2: distdir - test -f $(distdir)/ansi2knr.c - test -f $(distdir)/ansi2knr.1 -END - -cat >> configure.in << 'END' -AM_C_PROTOTYPES -AC_OUTPUT -END - -: > ansi2knr.c -: > ansi2knr.1 - -$ACLOCAL -$AUTOCONF -Wno-obsolete -$AUTOMAKE -Wno-obsolete - -./configure - -$MAKE test1 -$MAKE test2 - -: diff --git a/tests/ansi10.test b/tests/ansi10.test deleted file mode 100755 index 9334f09..0000000 --- a/tests/ansi10.test +++ /dev/null @@ -1,72 +0,0 @@ -#! /bin/sh -# Copyright (C) 2002, 2006, 2011 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, see <http://www.gnu.org/licenses/>. - -# Make sure ansi2knr works with $(LIBOBJS). - -required=gcc -. ./defs || Exit 1 - -cat >> configure.in << 'END' -AC_PROG_CC -AC_PROG_CC_STDC -AM_C_PROTOTYPES -AC_PROG_RANLIB -AC_LIBOBJ([hello]) -AC_CONFIG_FILES([dir/Makefile]) -AC_OUTPUT -END - -cat > Makefile.am << 'END' -SUBDIRS = dir -END - -mkdir dir - -cat > dir/Makefile.am << 'END' -AUTOMAKE_OPTIONS = ansi2knr -noinst_LIBRARIES = liblib.a -liblib_a_SOURCES = -liblib_a_LIBADD = $(LIBOBJS) -END - -cat > dir/hello.c << 'END' -#include <stdio.h> - -int -main (int argc, char **argv) -{ - printf ("hello\n"); -} -END - -$ACLOCAL -$AUTOCONF -Wno-obsolete -$AUTOMAKE -Wno-obsolete -a - -# Sanity check: make sure it's ok to set ac_cv_prog_cc_stdc as we do. -test `grep -c ac_cv_prog_cc_stdc configure` -gt 1 - -./configure ac_cv_prog_cc_stdc=no -$MAKE -test -f dir/hello_.c -$MAKE distclean -test ! -f dir/hello_.c - -# Also run without forcing ansi2knr, so we make sure the -# rules work with ANSI compilers. -./configure -$MAKE -test ! -f dir/hello_.c diff --git a/tests/ansi2.test b/tests/ansi2.test deleted file mode 100755 index 72bc758..0000000 --- a/tests/ansi2.test +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh -# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2010, 2011 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, see <http://www.gnu.org/licenses/>. - -# Test to make sure ansi2knr built at the right time. - -. ./defs || Exit 1 - -cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = ansi2knr -bin_PROGRAMS = joe -END - -cat >> configure.in << 'END' -AC_PROG_CC -AM_C_PROTOTYPES -END - -: > ansi2knr.c -: > ansi2knr.1 - -$ACLOCAL -$AUTOMAKE -Wno-obsolete - -grep '^all[-a-z]*:.*ANSI2KNR' Makefile.in diff --git a/tests/ansi2knr-deprecation.test b/tests/ansi2knr-deprecation.test deleted file mode 100755 index 543d9c6..0000000 --- a/tests/ansi2knr-deprecation.test +++ /dev/null @@ -1,69 +0,0 @@ -#! /bin/sh -# Copyright (C) 2011 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, see <http://www.gnu.org/licenses/>. - -# Check that the use of automatic de-ANSI-fication feature is deprecated. -# That feature will be removed in the next major Automake release. - -. ./defs || Exit 1 - -set -e - -warn_rx='automatic de-ANSI-fication.*deprecated' - -cat >> configure.in <<'END' -AC_PROG_CC -AM_C_PROTOTYPES -END - -$ACLOCAL - -$AUTOCONF -Wall -Werror -Wno-obsolete -$AUTOCONF -Wnone -Wobsolete -Werror 2>stderr && { cat stderr >&2; Exit 1; } -cat stderr >&2 -grep "^configure\\.in:5:.* AM_C_PROTOTYPES:.*$warn_rx" stderr - -sed '/AM_C_PROTOTYPES/d' configure.in > config.stub -diff configure.in config.stub && fatal_ "failed to edit configure.in" -rm -f configure.in - -cat > Makefile.stub <<'END' -ANSI2KNR = : -U = -END - -for opt in ansi2knr lib/ansi2knr; do - # ansi2knr option in Makefile.am - cp config.stub configure.in - cp Makefile.stub Makefile.am - echo "AUTOMAKE_OPTIONS = $opt" >> Makefile.am - cat Makefile.am # For debugging. - $AUTOMAKE -Wno-obsolete - AUTOMAKE_fails - grep "^Makefile\.am:3:.*$warn_rx" stderr - AUTOMAKE_fails -Wnone -Wobsolete - grep "^Makefile\.am:3:.*$warn_rx" stderr - # ansi2knr option in configure.in - cp Makefile.stub Makefile.am - sed "s|^\\(AM_INIT_AUTOMAKE\\).*|\1([$opt])|" config.stub > configure.in - cat configure.in # For debugging. - $AUTOMAKE -Wno-obsolete - AUTOMAKE_fails - grep "^configure\.in:2:.*$warn_rx" stderr - AUTOMAKE_fails -Wnone -Wobsolete - grep "^configure\.in:2:.*$warn_rx" stderr -done - -: diff --git a/tests/ansi3.test b/tests/ansi3.test deleted file mode 100755 index 23d8194..0000000 --- a/tests/ansi3.test +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/sh -# Copyright (C) 1998, 1999, 2001, 2002, 2003, 2010, 2011 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, see <http://www.gnu.org/licenses/>. - -# Actual test of ansi2knr functionality. Relies on existence -# of working gcc. - -required=gcc -. ./defs || Exit 1 - -cat >> configure.in << 'END' -AC_PROG_CC -AM_C_PROTOTYPES -AC_OUTPUT -END - -cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = ansi2knr no-dependencies -bin_PROGRAMS = hello -END - -cat > hello.c << 'END' -#include <stdio.h> -int -main (int argc, char *argv[]) -{ - printf ("yeah, yeah\n"); - return 0; -} -END - -# Ignore user CFLAGS. -CFLAGS= -export CFLAGS - -# We use gcc and not gcc -traditional as the latter fails on some -# Linux boxes (Red Hat 5.1 in particular). -$ACLOCAL -$AUTOCONF -Wno-obsolete -$AUTOMAKE -Wno-obsolete -a 2>stderr || { cat stderr >&2; Exit 1; } -cat stderr >&2 -grep 'Makefile.am:1:.*ansi2knr\.c' stderr -CC='gcc' ./configure -ANSI2KNR=./ansi2knr U=_ $MAKE -e -./hello diff --git a/tests/ansi3b.test b/tests/ansi3b.test deleted file mode 100755 index 5b8f472..0000000 --- a/tests/ansi3b.test +++ /dev/null @@ -1,59 +0,0 @@ -#! /bin/sh -# Copyright (C) 1998, 1999, 2001, 2002, 2003, 2010, 2011 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, see <http://www.gnu.org/licenses/>. - -# Actual test of ansi2knr functionality. Relies on existence -# of working gcc. Same as ansi3.test, but with AUTOMAKE_OPTIONS -# defined in configure.in. - -required=gcc -. ./defs || Exit 1 - -cat > configure.in << 'END' -AC_INIT([hello], [0.24]) -AM_INIT_AUTOMAKE([ansi2knr no-dependencies]) -AC_PROG_CC -AM_C_PROTOTYPES -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT -END - -echo 'bin_PROGRAMS = hello' > Makefile.am - -cat > hello.c << 'END' -#include <stdio.h> -int -main (int argc, char *argv[]) -{ - printf ("yeah, yeah\n"); - return 0; -} -END - -# Ignore user CFLAGS. -CFLAGS= -export CFLAGS - -# We use gcc and not gcc -traditional as the latter fails on some -# Linux boxes (Red Hat 5.1 in particular). -$ACLOCAL -$AUTOCONF -Wno-obsolete -$AUTOMAKE -Wno-obsolete -a 2>stderr || { cat stderr >&2; Exit 1; } -cat stderr >&2 -grep 'configure.in:2:.*ansi2knr\.1' stderr -CC='gcc' ./configure -ANSI2KNR=./ansi2knr U=_ $MAKE -e -./hello diff --git a/tests/ansi4.test b/tests/ansi4.test deleted file mode 100755 index 014c308..0000000 --- a/tests/ansi4.test +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh -# Copyright (C) 1999, 2001, 2002, 2008, 2010, 2011 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, see <http://www.gnu.org/licenses/>. - -# Quoting regression. Test from Thomas Gagne. - -. ./defs || Exit 1 - -cat >> configure.in << 'END' -AC_PROG_CC -AM_C_PROTOTYPES -END - -cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = ansi2knr -bin_PROGRAMS = hello -hello_SOURCES = hello.c -END - -: > ansi2knr.1 -: > ansi2knr.c -: > hello.c - -$ACLOCAL -$AUTOMAKE -Wno-obsolete - -$FGREP 'ansi2knr.$(' Makefile.in diff --git a/tests/ansi5.test b/tests/ansi5.test deleted file mode 100755 index c9c0d23..0000000 --- a/tests/ansi5.test +++ /dev/null @@ -1,89 +0,0 @@ -#! /bin/sh -# Copyright (C) 2001, 2002, 2003, 2011 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, see <http://www.gnu.org/licenses/>. - -# Test for ansi2knr in another directory. - -required=gcc -. ./defs || Exit 1 - -cat > configure.in << 'END' -AC_INIT(one/joe.c) -AM_INIT_AUTOMAKE(liver, 0.23) -AC_PROG_CC -AM_C_PROTOTYPES -AC_OUTPUT(Makefile one/Makefile two/Makefile) -END - -cat > Makefile.am << 'END' -SUBDIRS = one two -END - -mkdir one two - -cat > one/Makefile.am << 'END' -AUTOMAKE_OPTIONS = ansi2knr -bin_PROGRAMS = joe -END - -cat > two/Makefile.am << 'END' -AUTOMAKE_OPTIONS = ../one/ansi2knr -bin_PROGRAMS = maude -END - -cat > one/joe.c << 'END' -#include <stdio.h> -int -main (int argc, char *argv[]) -{ - printf ("joe\n"); - return 0; -} -END - -cat > two/maude.c << 'END' -#include <stdio.h> -int -main (int argc, char *argv[]) -{ - printf ("maude\n"); - return 0; -} -END - -$ACLOCAL -$AUTOCONF -Wno-obsolete -$AUTOMAKE -Wno-obsolete -a -# Ignore user CFLAGS. -CFLAGS= -export CFLAGS -CC=gcc ./configure - -# This is ugly! If we set U at make time then the "wrong" file gets -# included. -find . -name '*.Po' -print \ -| while read file; do - base="`echo $file | sed -e 's/\.Po//'`" - mv $file ${base}_.Po -done - -# So is this! If we set ANSI2KNR on the make command line then the -# wrong value is passed to two's Makefile. -mv one/Makefile one/Makefile.old -sed -e 's,ANSI2KNR =,ANSI2KNR = ./ansi2knr,' < one/Makefile.old > one/Makefile - -U=_ $MAKE -e -./one/joe -./two/maude diff --git a/tests/ansi6.test b/tests/ansi6.test deleted file mode 100755 index 5b1eb0a..0000000 --- a/tests/ansi6.test +++ /dev/null @@ -1,83 +0,0 @@ -#! /bin/sh -# Copyright (C) 2002, 2006, 2008, 2011 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, see <http://www.gnu.org/licenses/>. - -# Check ansi2knr on a source file in subdirectory. -# From Kevin Ryde. - -required=gcc -. ./defs || Exit 1 - -cat > configure.in << 'END' -AC_INIT(ansi6, 1.0) -AM_INIT_AUTOMAKE -AC_PROG_CC -AC_PROG_CC_STDC -AM_C_PROTOTYPES -AC_CONFIG_FILES(Makefile) -AC_OUTPUT -END - -cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = ansi2knr -bin_PROGRAMS = hello -hello_SOURCES = hello.c sub/dir.c -END - -cat > hello.c << 'END' -#include <stdio.h> - -extern int foo (); - -int -main (int argc, char **argv) -{ - printf ("%d\n", foo ()); -} -END - -mkdir sub - -cat > sub/dir.c << 'END' -int -foo () -{ - return 23; -} -END - -$ACLOCAL -$AUTOCONF -Wno-obsolete -$AUTOMAKE -Wno-obsolete -a - -# Sanity check: make sure it's ok to set ac_cv_prog_cc_stdc as we do. -test `grep -c ac_cv_prog_cc_stdc configure` -gt 1 - -./configure ac_cv_prog_cc_stdc=no -$MAKE - -test -f hello_.c -test -f dir_.c # Must be in current directory. -test ! -f sub/dir_.c -$MAKE distclean -test ! -f hello_.c -test ! -f dir_.c - -# Also run without forcing ansi2knr, so we make sure the -# rules work with ANSI compilers. -# Report from Andreas Schwab. - -./configure -$MAKE diff --git a/tests/ansi7.test b/tests/ansi7.test deleted file mode 100755 index 966a860..0000000 --- a/tests/ansi7.test +++ /dev/null @@ -1,85 +0,0 @@ -#! /bin/sh -# Copyright (C) 2002, 2008, 2011 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, see <http://www.gnu.org/licenses/>. - -# Check ansi2knr on a source file in subdirectory. -# ansi6.test is the same test without subdir-objects. -# From Kevin Ryde. - -required=gcc -. ./defs || Exit 1 - -cat > configure.in << 'END' -AC_INIT(ansi6, 1.0) -AM_INIT_AUTOMAKE -AC_PROG_CC -AC_PROG_CC_STDC -AM_PROG_CC_C_O -AM_C_PROTOTYPES -AC_CONFIG_FILES(Makefile) -AC_OUTPUT -END - -cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = ansi2knr subdir-objects -bin_PROGRAMS = hello -hello_SOURCES = hello.c sub/dir.c -END - -cat > hello.c << 'END' -#include <stdio.h> - -extern int foo (); - -int -main (int argc, char **argv) -{ - printf ("%d\n", foo ()); -} -END - -mkdir sub - -cat > sub/dir.c << 'END' -int -foo () -{ - return 23; -} -END - -$ACLOCAL -$AUTOCONF -Wno-obsolete -$AUTOMAKE -Wno-obsolete -a - -# Sanity check: make sure it's ok to set ac_cv_prog_cc_stdc as we do. -test `grep -c ac_cv_prog_cc_stdc configure` -gt 1 - -./configure ac_cv_prog_cc_stdc=no -$MAKE - -test -f hello_.c -test -f sub/dir_.c # Must be in sub directory, unlike ansi6.test. -test ! -f dir_.c -$MAKE distclean -test ! -f hello_.c -test ! -f sub/dir_.c - -# Also run without forcing ansi2knr, so we make sure the -# rules work with ANSI compilers. -# Report from Andreas Schwab. - -./configure -$MAKE diff --git a/tests/ansi8.test b/tests/ansi8.test deleted file mode 100755 index 815a9ae..0000000 --- a/tests/ansi8.test +++ /dev/null @@ -1,28 +0,0 @@ -#! /bin/sh -# Copyright (C) 2002, 2003, 2011 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, see <http://www.gnu.org/licenses/>. - -# Check that AM_C_PROTOTYPES is required by ansi2knr - -. ./defs || Exit 1 - -cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = ansi2knr -bin_PROGRAMS = hello -END - -$ACLOCAL -AUTOMAKE_fails -Wno-obsolete -a -grep AM_C_PROTOTYPES stderr diff --git a/tests/ansi9.test b/tests/ansi9.test deleted file mode 100755 index d1a1a0d..0000000 --- a/tests/ansi9.test +++ /dev/null @@ -1,60 +0,0 @@ -#! /bin/sh -# Copyright (C) 2002, 2003, 2011 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, see <http://www.gnu.org/licenses/>. - -# Check that subdir sources, and file compiled using per-target flags -# can still be deansified. -# Report from Paul D. Smith. - -required=gcc -. ./defs || Exit 1 - -cat >>configure.in <<EOF -AC_PROG_CC -AM_PROG_CC_C_O -AM_C_PROTOTYPES -AC_OUTPUT -EOF - -cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = ansi2knr subdir-objects -noinst_PROGRAMS = loadavg sub/sub -loadavg_SOURCES = loadavg.c -loadavg_CFLAGS = -DTEST -sub_sub_SOURCES = sub/sub.c -END - -cat > loadavg.c << 'END' -int -main () -{ - return 0; -} -END - -mkdir sub -cp loadavg.c sub/sub.c - -$ACLOCAL -$AUTOCONF -Wno-obsolete -$AUTOMAKE --add-missing -Wno-override -Wno-obsolete - -$FGREP 'loadavg-loadavg$U.o: loadavg$U.c' Makefile.in -# The following rule should not exist, because the -# default .o.c: inference rule is enough. -$FGREP 'sub/sub$U.o: sub/sub$U.c' Makefile.in && Exit 1 -# Force ansi2knr's use, regardless of the compiler. -./configure ac_cv_prog_cc_stdc=no -$MAKE sub/sub_.c diff --git a/tests/cxxansi.test b/tests/cxxansi.test deleted file mode 100755 index 49b4a7e..0000000 --- a/tests/cxxansi.test +++ /dev/null @@ -1,45 +0,0 @@ -#! /bin/sh -# Copyright (C) 2001, 2002, 2010, 2011 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, see <http://www.gnu.org/licenses/>. - -# Test to make sure ansi2knr doesn't use `$U' for C++. -# Report from Robert Boehne. - -. ./defs || Exit 1 - -cat >> configure.in << 'END' -AC_PROG_CXX -AM_C_PROTOTYPES -END - -cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = ansi2knr -sbin_PROGRAMS = anonymous -anonymous_SOURCES = doe.c jane.C -END - -: > ansi2knr.c -: > ansi2knr.1 - -: > doe.C -: > jane.C - -$ACLOCAL -$AUTOMAKE -Wno-obsolete - -$FGREP 'jane$U' Makefile.in && Exit 1 -$FGREP 'doe$U' Makefile.in - -Exit 0 diff --git a/tests/libobj8.test b/tests/libobj8.test deleted file mode 100755 index 0745f61..0000000 --- a/tests/libobj8.test +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/sh -# Copyright (C) 1998, 2000, 2001, 2002, 2006, 2010, 2011 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, see <http://www.gnu.org/licenses/>. - -# Test to make sure `_.c' dependencies are generated for LIBOBJS -# objects. - -. ./defs || Exit 1 - -cat >> configure.in << 'END' -AC_PROG_CC -AC_PROG_CC_STDC -AC_PROG_RANLIB -AC_REPLACE_FUNCS(basename dirname strsignal) -AM_C_PROTOTYPES -AC_OUTPUT -END - -cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = ansi2knr -noinst_LIBRARIES = libtu.a -libtu_a_SOURCES = -libtu_a_LIBADD = @LIBOBJS@ -END - -: > basename.c -: > dirname.c -: > strsignal.c - -: > ansi2knr.1 -: > ansi2knr.c - -$ACLOCAL -$AUTOMAKE -Wno-obsolete - -$FGREP 'strsignal_.c:' Makefile.in - -: diff --git a/tests/subobj3.test b/tests/subobj3.test deleted file mode 100755 index 5ba999c..0000000 --- a/tests/subobj3.test +++ /dev/null @@ -1,66 +0,0 @@ -#! /bin/sh -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2010, 2011 -# 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, see <http://www.gnu.org/licenses/>. - -# Test of subdir objects with C++. - -required=gcc -. ./defs || Exit 1 - -cat > configure.in << END -AC_INIT([$me], [1.0]) -dnl Prevent automake from looking in .. and ../.. -AC_CONFIG_AUX_DIR([.]) -AM_INIT_AUTOMAKE -AC_PROG_CC -AC_PROG_CC_STDC -AM_PROG_CC_C_O -AM_C_PROTOTYPES -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT -END - -cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = subdir-objects -bin_PROGRAMS = hello -hello_SOURCES = sub/hello.c -END - -mkdir sub -cat > sub/hello.c << 'END' -#include <stdio.h> -int -main (int argc, char *argv[]) -{ - printf ("yeah, yeah\n"); - return 0; -} -END - -# Ignore user CFLAGS. -CFLAGS= -export CFLAGS - -# We use gcc and not gcc -traditional as the latter fails on some -# Linux boxes (Red Hat 5.1 in particular). -$ACLOCAL -$AUTOCONF -$AUTOMAKE -a -./configure -ANSI2KNR=./ansi2knr U=_ $MAKE -e -./hello - -: -- 1.7.2.3