4 files changed, 22 insertions, 89 deletions
diff --git a/Makefile.am b/Makefile.am
index 01ab703d..3cffdc39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -796,8 +796,6 @@ clean-local:
 #           complete this section should be removed.
 
 TESTS = \
-	tests/link.test \
-	tests/link-2.test \
 	tests/objectlist.test \
 	tests/tagtrace.test
 
diff --git a/tests/libtool.at b/tests/libtool.at
index 747b506c..b3f2b6b4 100755
--- a/tests/libtool.at
+++ b/tests/libtool.at
@@ -156,3 +156,25 @@ for name in $bad_names; do
 done
 
 AT_CLEANUP
+
+
+## --------------------- ##
+## Check link operation. ##
+## --------------------- ##
+
+AT_SETUP([check link mode operation])
+
+AT_CHECK([$LIBTOOL -n --mode=link $CC -o gettext ../lib/libnlsut.a], [0], [stdout])
+AT_CHECK([$EGREP '../lib/libnlsut.a' stdout], [0], [ignore])
+
+
+AT_DATA([hell.lo],
+[[# Generated by libtool
+pic_object=none
+non_pic_object=hell.o
+]])
+
+AT_CHECK([$LIBTOOL --mode=link $CC -o something foo.o hell.lo], [1], [stdout], [ignore])
+AT_CHECK([$FGREP '.lo ' stdout], [1], [ignore])
+
+AT_CLEANUP
diff --git a/tests/link-2.test b/tests/link-2.test
deleted file mode 100755
index d7c18959..00000000
--- a/tests/link-2.test
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-# link-2.test - check that .lo files aren't made into programs.
-#
-#   Copyright (C) 2003-2004, 2011-2012 Free Software Foundation, Inc.
-#   Written by Gary V. Vaughan, 2003
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool 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 of
-# the License, or (at your option) any later version.
-#
-# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from  http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-####
-
-. tests/defs || exit 1
-
-rm -f hell.lo
-cat > hell.lo <<EOF
-# Generated by libtool
-pic_object=none
-non_pic_object=hell.o
-EOF
-
-# Try a sample link command.
-linkresult=`$LIBTOOL -n --mode=link $CC -o something foo.o hell.lo`
-res=$?
-
-rm -f hell.lo
-
-test 0 -eq "$res" || exit $EXIT_FAILURE
-
-echo "$linkresult"
-case $linkresult in
-*".lo "*)
-  func_fail "$progname: .lo files should not be linked into programs"
-  ;;
-esac
-
-exit $EXIT_SUCCESS
diff --git a/tests/link.test b/tests/link.test
deleted file mode 100755
index fec376c2..00000000
--- a/tests/link.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# link.test - make sure that linking against libraries is legal.
-#
-#   Copyright (C) 2003-2004, 2011-2012 Free Software Foundation, Inc.
-#   Written by Gary V. Vaughan, 2003
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool 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 of
-# the License, or (at your option) any later version.
-#
-# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from  http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-####
-
-. tests/defs || exit 1
-
-# Try a sample link command.
-linkresult=`$LIBTOOL -n --mode=link $CC -o gettext ../lib/libnlsut.a`
-test $? -eq 0 || exit $EXIT_FAILURE
-
-echo "$linkresult"
-echo "$linkresult" | $EGREP ../lib/libnlsut.a >/dev/null 2>&1 || {
-  func_fail "$progname: ../lib/libnlsut.a was not used as expected in linking"
-}
-
-exit $EXIT_SUCCESS