* tests/duplicate_deps.at: Make the XFAIL unconditional, but

skip the test if the test link would succeed even without
--preserve-dup-deps.

diff --git a/ChangeLog b/ChangeLog
index 74f2793e2c60dd2b3c86ea30e999a306bfa9a7f9..1ed15040f713c7ab12ac111cffe8a3a75ce11422 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-05-10  Noah Misch  <noah@cs.caltech.edu>
 
+       * tests/duplicate_deps.at: Make the XFAIL unconditional, but
+       skip the test if the test link would succeed even without
+       --preserve-dup-deps.
+
        * libltdl/config/general.m4sh (func_echo): Use $* instead of
        ${1+"$@"}.
 

diff --git a/tests/duplicate_deps.at b/tests/duplicate_deps.at
index 2e5bd1143e48cd3e32831101d4e62a729a6310fb..0c4ce6b99243772ccdd8035e7f4b3551653aa00f 100644 (file)
--- a/tests/duplicate_deps.at
+++ b/tests/duplicate_deps.at
@@ -1,6 +1,6 @@
 # duplicate_deps.at -- preserve duplicate convenience deps    -*- Autotest -*-
 
-#   Copyright (C) 2006 Free Software Foundation, Inc.
+#   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2006
 $
 #   This file is part of GNU Libtool.
@@ -60,9 +60,15 @@ AT_CHECK([$LIBTOOL --mode=link --tag=CC \
          [0], [ignore], [ignore])
 LT_AT_EXEC_CHECK([./main])
 
-# This currently fails:
-AT_XFAIL_IF([case $host_os in aix*) false;; *) :;; esac])
+# Forgo the workaround and create a true circular dependency.
 $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libb.la b1.lo
+# Some systems find all symbols anyway; skip this test on such systems.
+AT_CHECK([$LIBTOOL --mode=link --tag=CC \
+         $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la libb.la liba.la \
+         && exit 77],
+         [1], [ignore], [ignore])
+# Other systems need special treatment, which currently fails.
+AT_XFAIL_IF([:])
 AT_CHECK([$LIBTOOL --mode=link --preserve-dup-deps --tag=CC \
          $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la libb.la liba.la],
          [0], [ignore], [ignore])