From 385ee099eeae53bff5dd5adf673ad4f4b8d22981 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Sat, 10 Apr 2021 12:24:40 +0200 Subject: [PATCH] libphobos: Explicitly use -static-libphobos in druntime and phobos tests Linking to libphobos statically is the default in the driver, however this may change in future. Be explicit that the static libphobos is what's being tested. libphobos/ChangeLog: * testsuite/libphobos.druntime/druntime.exp: Compile all tests with -static-libphobos. * testsuite/libphobos.phobos/phobos.exp: Likewise. --- libphobos/testsuite/libphobos.druntime/druntime.exp | 3 ++- libphobos/testsuite/libphobos.phobos/phobos.exp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libphobos/testsuite/libphobos.druntime/druntime.exp b/libphobos/testsuite/libphobos.druntime/druntime.exp index df01fcc..daedfd7 100644 --- a/libphobos/testsuite/libphobos.druntime/druntime.exp +++ b/libphobos/testsuite/libphobos.druntime/druntime.exp @@ -34,7 +34,8 @@ dg-init # Main loop. foreach test $tests { set libphobos_test_name "$subdir/[dg-trim-dirname $srcdir/../libdruntime $test]" - dg-runtest $test "" "-fmain -fbuilding-libphobos-tests $version_flags" + dg-runtest $test "-static-libphobos" \ + "-fmain -fbuilding-libphobos-tests $version_flags" set libphobos_test_name "" } diff --git a/libphobos/testsuite/libphobos.phobos/phobos.exp b/libphobos/testsuite/libphobos.phobos/phobos.exp index 770e576..937849e 100644 --- a/libphobos/testsuite/libphobos.phobos/phobos.exp +++ b/libphobos/testsuite/libphobos.phobos/phobos.exp @@ -45,7 +45,8 @@ dg-init # Main loop. foreach test $tests { set libphobos_test_name "$subdir/[dg-trim-dirname $srcdir/../src $test]" - dg-runtest $test "" "-fmain -fbuilding-libphobos-tests $version_flags" + dg-runtest $test "-static-libphobos" \ + "-fmain -fbuilding-libphobos-tests $version_flags" set libphobos_test_name "" } -- 2.7.4