From 760f6ee894c5f473777c7ff5ebe5a04b25651ce4 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 18 Jan 2016 11:23:44 +0000 Subject: [PATCH] Skip linker plugin tests if the linker has not been configured to support plugins. * ld-plugin/plugin.exp: Skip plugin tests if the linker is not configured to support plugins. --- ld/ChangeLog | 5 +++++ ld/testsuite/ld-plugin/plugin.exp | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ld/ChangeLog b/ld/ChangeLog index d20c76c2eda..ba6c46347aa 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2016-01-18 Nick Clifton + + * testsuite/ld-plugin/plugin.exp: Skip plugin tests if the linker + is not configured to support plugins. + 2016-01-17 Alan Modra * configure: Regenerate. diff --git a/ld/testsuite/ld-plugin/plugin.exp b/ld/testsuite/ld-plugin/plugin.exp index 64f40790d30..a8b0e4a245c 100644 --- a/ld/testsuite/ld-plugin/plugin.exp +++ b/ld/testsuite/ld-plugin/plugin.exp @@ -39,6 +39,12 @@ global base_dir # Look for the name we can dlopen in the test plugin's libtool control script. set plugin_name [file_contents "$base_dir/libldtestplug.la"] set plugin_name [regsub "'.*" [regsub ".*dlname='" "$plugin_name" ""] ""] +# Even though the API supports plugins it does not mean that the +# linker was configured with --enable-plugins. Check for that here. +if { $plugin_name == "" } { + verbose "The linker is not configured to support plugins" + return +} verbose "plugin name is '$plugin_name'" set plugin2_name [file_contents "$base_dir/libldtestplug2.la"] -- 2.30.2