From 89049b76cfcfc048dccfdab1ec8a0e233d97e8ce Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 4 Dec 2014 16:34:17 +0000 Subject: [PATCH] tests: do not assume compiler prefers shared libraries. Testing whether -static-libtool-libs causes a non-libtool library to be linked dynamically is effectively a test of the compiler's preference in this case. The Cray compiler prefers static libraries if not told otherwise. * tests/static.at [static linking flags for programs]: Do not expect -static-libtool-libs to fail. Signed-off-by: Gary V. Vaughan --- tests/static.at | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/static.at b/tests/static.at index 19125de96..240a2181f 100644 --- a/tests/static.at +++ b/tests/static.at @@ -344,7 +344,10 @@ for withdep in no yes; do echo "### test whether non-libtool library liba3 was linked statically" func_move_libs a3 $prefix3 $prefix1 $prefix2 func_test_exec $all_static `$per_deplib && echo 3 13 23 31 123 123a` - func_test_exec_fail -static -static-libtool-libs `$per_deplib && echo 1 2 12` + # no '-static-libtool-libs' flag below, because some hosts such as + # Cray prefer static libs by default. + # and doesn't exercise anything not already tested above: + func_test_exec_fail -static `$per_deplib && echo 1 2 12` func_restore_libs a3 $prefix3 cd .. -- 2.47.3