From 1a1b757d1ea1e86d226886e088ae88562884cade Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Thu, 10 May 2007 17:30:29 +0000 Subject: [PATCH] * tests/duplicate_deps.at: Make the XFAIL unconditional, but skip the test if the test link would succeed even without --preserve-dup-deps. --- ChangeLog | 4 ++++ tests/duplicate_deps.at | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74f2793e2..1ed15040f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-05-10 Noah Misch + * 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 2e5bd1143..0c4ce6b99 100644 --- 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]) -- 2.47.3