objc: reorganize basic tests

* t/objc.sh, t/objc2.sh: Removed, merged into ...
* t/objc-basic.sh: ... this new test.
* t/objcxx-basic.sh: Add reference to new sister test.
* t/list-of-tests.mk: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

4 files changed, 19 insertions, 48 deletions

diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index d19c74a75..41f8927c4 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -702,8 +702,7 @@ t/nolink.sh \
 t/nostdinc.sh \
 t/notrans.sh \
 t/number.sh \
-t/objc.sh \
-t/objc2.sh \
+t/objc-basic.sh \
 t/objc-minidemo.sh \
 t/objcxx-basic.sh \
 t/objcxx-minidemo.sh \
diff --git a/t/objc2.sh b/t/objc-basic.sh
index 290bf2642..f608fbc83 100755
--- a/t/objc2.sh
+++ b/t/objc-basic.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -10,22 +10,29 @@
 # 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 that Automake suggests using AC_PROG_OBJC if Objective C sources
-# are used.
+# Basic tests on the Objective C support that don't actually
+# require an Objective-C compiler.
+# See also sister test 'objcxx-basic.sh'.
 
 . ./defs || Exit 1
 
-echo AC_PROG_CC >>configure.ac
-
-cat >Makefile.am <<'END'
+cat > Makefile.am <<'END'
 bin_PROGRAMS = hello
 hello_SOURCES = hello.m
 END
 
 $ACLOCAL
 AUTOMAKE_fails
-grep AC_PROG_OBJC stderr
+grep "'OBJC'.* undefined" stderr
+grep "add .*'AC_PROG_OBJC'" stderr
+
+rm -rf autom4te*.cache
+
+echo AC_PROG_OBJC >> configure.ac
+
+$ACLOCAL
+$AUTOMAKE
+$EGREP '^\.SUFFIXES:.* \.m( |$)' Makefile.in
+
+:
diff --git a/t/objc.sh b/t/objc.sh
deleted file mode 100755
index f56c76d8c..000000000
--- a/t/objc.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001-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 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 that '.m' extension works.
-# From Ralf Corsepius (for C++).
-
-. ./defs || Exit 1
-
-cat >> configure.ac << 'END'
-AC_PROG_OBJC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = hello
-hello_SOURCES = hello.m
-END
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '^\.SUFFIXES:.*\.m' Makefile.in
-
-:
diff --git a/t/objcxx-basic.sh b/t/objcxx-basic.sh
index 33b801797..be2cdf752 100755
--- a/t/objcxx-basic.sh
+++ b/t/objcxx-basic.sh
@@ -13,6 +13,7 @@
 
 # Basic tests on the Objective C++ support that don't actually
 # require an Objective-C++ compiler.
+# See also sister test 'objc-basic.sh'.
 
 . ./defs || Exit 1