[SCM] GNU Libtool branch, master, updated. v2.2.10-146-g26dacf3

[Peter Rosin]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  26dacf3464210910602ce0f679f9770241d7a16e (commit)
      from  185a2f71d0d1b1727fcc45c3840a5d4f7ebfa7ef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 26dacf3464210910602ce0f679f9770241d7a16e
Author: Peter Rosin <address@hidden>
Date:   Tue Aug 31 20:59:11 2010 +0200

    archive-in-archive.at passes with Microsoft lib.
    
    * tests/archive-in-archive.at: Tighten test to check that the desired
    object files are indeed part of the archive. Microsoft lib still
    passes, so remove the expected failure for that case.
    
    Signed-off-by: Peter Rosin <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                   |    5 +++++
 tests/archive-in-archive.at |    5 ++++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 355b485..585356c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-08-31  Peter Rosin  <address@hidden>
 
+       archive-in-archive.at passes with Microsoft lib.
+       * tests/archive-in-archive.at: Tighten test to check that the desired
+       object files are indeed part of the archive. Microsoft lib still
+       passes, so remove the expected failure for that case.
+
        Dump archiver output to the log when testing @file support.
        * libltdl/m4/libtool.m4 (_LT_PROG_AR): Redirect stdout to config.log
        when testing for @file support.
diff --git a/tests/archive-in-archive.at b/tests/archive-in-archive.at
index 32e3543..fd67c7d 100644
--- a/tests/archive-in-archive.at
+++ b/tests/archive-in-archive.at
@@ -26,7 +26,8 @@
 AT_SETUP([static library contains static library])
 AT_KEYWORDS([libtool])
 
-AT_XFAIL_IF([:]) dnl This is currently broken
+# This test passes with MS lib.
+AT_XFAIL_IF([case $AR in ar-lib\ * | *[[/\\]]ar-lib\ *) false;; *) :;; esac])
 
 AT_DATA([foo.c],
 [
@@ -53,4 +54,6 @@ AT_CHECK([$LIBTOOL --mode=install cp libbar.la $thisdir], [], 
[ignore], [ignore]
 eval `$EGREP '^(old_library)=' < libbar.la`
 libbar=$old_library
 AT_CHECK([$AR -t $libbar | grep $libfoo],[1],[ignore],[ignore])
+AT_CHECK([$AR -t $libbar | grep foo.$OBJEXT],[],[ignore],[ignore])
+AT_CHECK([$AR -t $libbar | grep bar.$OBJEXT],[],[ignore],[ignore])
 AT_CLEANUP


hooks/post-receive
-- 
GNU Libtool