From f4c42158c5856e044c85564b31c2f9592d5a1253 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 28 Nov 2004 19:47:19 +0000 Subject: [PATCH] * 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. --- ChangeLog | 4 ++++ tests/demo-relink.test | 5 +++-- tests/depdemo-relink.test | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e957de4c7..9e1c0df3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-11-28 Ralf Wildenhues + * 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 1d5d1a3ff..36ecd7233 100755 --- 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 733cf6ea2..4a574fb10 100755 --- 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 -- 2.47.2