[SCM] GNU Libtool branch, master, updated. v2.2.6-175-g574b794

[Ralf Wildenhues]

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  574b79474a2a8f5b83ff40c3cd3adacbaeea32fe (commit)
      from  85223ba6a414f591924f904fb217919439760ac8 (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 574b79474a2a8f5b83ff40c3cd3adacbaeea32fe
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Jan 11 21:45:58 2010 +0100

    Testsuite exposure for relative output file names and deplibs.
    
    * tests/deplib-in-subdir.at (deplib in subdir): New file, new
    test.
    * Makefile.am (TESTSUITE_AT): Update.
    Prompted by report from Bob Friesenhahn.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                 |    8 ++
 Makefile.am               |    1 +
 tests/deplib-in-subdir.at |  157 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 166 insertions(+), 0 deletions(-)
 create mode 100644 tests/deplib-in-subdir.at

diff --git a/ChangeLog b/ChangeLog
index 68da218..415a02f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 2010-01-11  Ralf Wildenhues  <address@hidden>
+
+       Testsuite exposure for relative output file names and deplibs.
+       * tests/deplib-in-subdir.at (deplib in subdir): New file, new
+       test.
+       * Makefile.am (TESTSUITE_AT): Update.
+       Prompted by report from Bob Friesenhahn.
+
+2010-01-11  Ralf Wildenhues  <address@hidden>
            Bob Friesenhahn  <address@hidden>
 
        Testsuite exposure for C++ exception handling.
diff --git a/Makefile.am b/Makefile.am
index 445d01d..0190841 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -471,6 +471,7 @@ TESTSUITE_AT        = tests/testsuite.at \
                  tests/execute-mode.at \
                  tests/bindir.at \
                  tests/cwrapper.at \
+                 tests/deplib-in-subdir.at \
                  tests/infer-tag.at \
                  tests/localization.at \
                  tests/install.at \
diff --git a/tests/deplib-in-subdir.at b/tests/deplib-in-subdir.at
new file mode 100644
index 0000000..048512a
--- /dev/null
+++ b/tests/deplib-in-subdir.at
@@ -0,0 +1,157 @@
+# deplib-in-subdir.at --                         -*- Autotest -*-
+
+#   Copyright (C) 2010 Free Software Foundation, Inc.
+#
+#   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.
+####
+
+# It should be possible to use a nontrivial relative path to the output
+# file name when creating libraries and programs.  The deplibs of these
+# might have relative paths as well.  When executing uninstalled programs,
+# the paths relative to $PWD at build time needs to be translated to a
+# path valid at execution time.
+#
+# Also test installing these libraries and programs; however,
+# use consistent relative paths between `libtool --mode=link' and
+# `libtool --mode=install' in this test.
+
+AT_SETUP([deplib in subdir])
+AT_KEYWORDS([libtool])
+
+AT_DATA([a1.c],
+[[int a1 () { return 0; }
+]])
+AT_DATA([a2.c],
+[[int a2 () { return 0; }
+]])
+AT_DATA([a3.c],
+[[int a3 () { return 0; }
+]])
+AT_DATA([b1.c],
+[[extern int a1 ();
+int b1 () { return a1 (); }
+]])
+AT_DATA([b2.c],
+[[extern int a2 ();
+int b2 () { return a2 (); }
+]])
+AT_DATA([b3.c],
+[[extern int a3 ();
+int b3 () { return a3 (); }
+]])
+AT_DATA([m.c],
+[[extern int b1 ();
+extern int b2 ();
+extern int b3 ();
+int main () { return b1 () + b2 () + b3 (); }
+]])
+
+cwd=`pwd`
+instdir=$cwd/inst
+lib1dir=$instdir/lib1
+lib2dir=$instdir/lib2
+bindir=$instdir/bin
+addrunpath=$cwd/foobar
+LDFLAGS="$LDFLAGS -no-undefined"
+
+flags='-export-symbols-regex ".*"'
+
+mkdir -p sub1 sub2/subsub sub3/subsub $instdir $lib1dir $lib2dir $bindir
+
+for file in a1.c a2.c a3.c b1.c b2.c b3.c; do
+  $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c $file
+done
+$CC $CPPFLAGS $CFLAGS -c m.c
+AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o sub1/liba1.la a1.lo 
-rpath $lib1dir],
+        [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o sub1/liba2.la a2.lo 
-rpath $lib1dir],
+        [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o sub1/liba3.la a3.lo 
-rpath $lib1dir],
+        [], [ignore], [ignore])
+
+AT_CHECK([eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o 
sub2/subsub/libb1.la b1.lo ]dnl
+        [-rpath $lib2dir sub1/liba1.la' "$flags"],
+        [], [ignore], [ignore])
+cd sub2
+AT_CHECK([eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o subsub/libb2.la 
../b2.lo ]dnl
+        [-rpath $lib2dir ../sub1/liba2.la' "$flags"],
+        [], [ignore], [ignore])
+cd subsub
+AT_CHECK([eval '$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o libb3.la 
../../b3.lo ]dnl
+        [-rpath $lib2dir ../../sub1/liba3.la' "$flags"],
+        [], [ignore], [ignore])
+cd ../..
+AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o sub3/subsub/m1$EXEEXT 
m.$OBJEXT ]dnl
+        [sub2/subsub/libb1.la sub2/subsub/libb2.la sub2/subsub/libb3.la],
+        [], [ignore], [ignore])
+cd sub3
+AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o subsub/m2$EXEEXT 
../m.$OBJEXT ]dnl
+        [../sub2/subsub/libb1.la ../sub2/subsub/libb2.la 
../sub2/subsub/libb3.la],
+        [], [ignore], [ignore])
+cd subsub
+AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o m3$EXEEXT 
../../m.$OBJEXT ]dnl
+        [../../sub2/subsub/libb1.la ../../sub2/subsub/libb2.la 
../../sub2/subsub/libb3.la],
+        [], [ignore], [ignore])
+cd ../..
+
+for i in 1 2 3; do
+  LT_AT_EXEC_CHECK([./sub3/subsub/m$i])
+  cd sub3
+  LT_AT_EXEC_CHECK([./subsub/m$i])
+  cd subsub
+  LT_AT_EXEC_CHECK([./m$i])
+  cd ../..
+done
+
+for i in 1 2 3; do
+  AT_CHECK([$LIBTOOL --mode=install cp sub1/liba$i.la $lib1dir/liba.la], [], 
[ignore], [ignore])
+done
+
+AT_CHECK([$LIBTOOL --mode=install cp sub2/subsub/libb1.la $lib2dir/libb1.la], 
[], [ignore], [ignore])
+cd sub2
+AT_CHECK([$LIBTOOL --mode=install cp subsub/libb2.la $lib2dir/libb2.la], [], 
[ignore], [ignore])
+cd subsub
+AT_CHECK([$LIBTOOL --mode=install cp libb3.la $lib2dir/libb3.la], [], 
[ignore], [ignore])
+cd ../..
+
+AT_CHECK([$LIBTOOL --mode=install cp sub3/subsub/m1$EXEEXT $bindir/m1$EXEEXT], 
[], [ignore], [ignore])
+cd sub3
+AT_CHECK([$LIBTOOL --mode=install cp subsub/m2$EXEEXT $bindir/m2$EXEEXT], [], 
[ignore], [ignore])
+cd subsub
+AT_CHECK([$LIBTOOL --mode=install cp m3$EXEEXT $bindir/m3$EXEEXT], [], 
[ignore], [ignore])
+cd ../..
+
+AT_CHECK([$LIBTOOL --mode=clean rm -f sub1/liba1.la sub1/liba2.la 
sub1/liba3.la ]dnl
+        [sub2/subsub/libb1.la sub2/subsub/libb2.la sub2/subsub/libb3.la ]dnl
+        [sub3/subsub/m1$EXEEXT sub3/subsub/m2$EXEEXT sub3/subsub/m3$EXEEXT],
+        [], [ignore], [ignore])
+
+for i in 1 2 3; do
+  LT_AT_EXEC_CHECK([$bindir/m$i$EXEEXT])
+  cd $bindir
+  LT_AT_EXEC_CHECK([./m$i$EXEEXT])
+  cd $cwd
+done
+
+PATH=$bindir${PATH_SEPARATOR-:}$PATH
+for i in 1 2 3; do
+  LT_AT_EXEC_CHECK([m$i$EXEEXT])
+done
+
+AT_CLEANUP


hooks/post-receive
-- 
GNU Libtool