* 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.

diff --git a/ChangeLog b/ChangeLog
index e957de4c72d6e484d7a68d61a652eadf33e2a98d..9e1c0df3df43f05cb2f4f3a287d50762e85409de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-11-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * 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.
+
        * libltdl/loaders/loadlibrary.c: Remove unneeded
        file-static variable.
 

diff --git a/tests/demo-relink.test b/tests/demo-relink.test
index 1d5d1a3ffa35ebce6e651459b8c81a00ba0946a0..36ecd7233f51abde33da4e37919d520837d5bb59 100755 (executable)
--- a/tests/demo-relink.test
+++ b/tests/demo-relink.test
@@ -42,12 +42,13 @@ func_require "demo-inst" "$prefix/lib/libhello.la"  "demo/libhello.la"
 
 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

diff --git a/tests/depdemo-relink.test b/tests/depdemo-relink.test
index 733cf6ea29816107d4869e178ae6319e9e5b2989..4a574fb10440260e48ec7582ed66c287d545f392 100755 (executable)
--- a/tests/depdemo-relink.test
+++ b/tests/depdemo-relink.test
@@ -45,12 +45,13 @@ func_require "depdemo-inst" "$prefix/lib/libl3.la"  "depdemo/l3/libl3.la"
 
 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