libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

demo-relink skip


From: Ralf Wildenhues
Subject: demo-relink skip
Date: Sat, 27 Nov 2004 15:33:52 +0100
User-agent: Mutt/1.5.6+20040722i

I'm not really sure about this one, but on a static-only platform,
demo-relink.test and depdemo-relink.test should SKIP and not FAIL.
Would it be necessary to insert another check above this?  I moved the
func_save_files down because it tries to access the file .libs/lt-hell
which does not exist in a static-only system.

OK to commit against HEAD and branch-2-0?

Regards,
Ralf

        * tests/demo-relink.test, tests/depdemo-relink.test: SKIP, don't
        FAIL if no shared libs available in demo/.  Do not try to access
        nonexistent files.


Index: tests/demo-relink.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/demo-relink.test,v
retrieving revision 1.5
diff -u -r1.5 demo-relink.test
--- tests/demo-relink.test      23 Sep 2004 14:50:36 -0000      1.5
+++ tests/demo-relink.test      27 Nov 2004 14:34:11 -0000
@@ -42,12 +42,13 @@
 
 func_mkprefixdir
 func_cd "demo"
-func_save_files
 
 # Check to make sure we have a dynamic library.
 func_get_config "library_names" "cat libhello.la"
 test -z "$library_names" \
-  && func_fatal_error "Exiting: demo/libhello.la is not a shared library"
+  && func_skip "Exiting: demo/libhello.la is not a shared library"
+
+func_save_files
 
 func_get_config 'shlibpath_overrides_runpath
 hardcode_action
Index: tests/depdemo-relink.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/depdemo-relink.test,v
retrieving revision 1.6
diff -u -r1.6 depdemo-relink.test
--- tests/depdemo-relink.test   23 Sep 2004 14:50:36 -0000      1.6
+++ tests/depdemo-relink.test   27 Nov 2004 14:34:11 -0000
@@ -45,12 +45,13 @@
 
 func_mkprefixdir
 func_cd "depdemo"
-func_save_files
 
 # Check to make sure we have a dynamic library.
 func_get_config "library_names" "cat l3/libl3.la"
 test -z "$library_names" \
-  && func_fatal_error "Exiting: depdemo/l3/libl3.la is not a shared library"
+  && func_skip "Exiting: depdemo/l3/libl3.la is not a shared library"
+
+func_save_files
 
 func_get_config 'shlibpath_overrides_runpath
 hardcode_action




reply via email to

[Prev in Thread] Current Thread [Next in Thread]