From 5b97f9d348c400630a61f8fe47f188f63e5a9b2a Mon Sep 17 00:00:00 2001 From: Alexander Akulich Date: Sun, 1 Nov 2020 18:10:22 +0300 Subject: Adjust tests/twisted/tools/exec-with-log.sh to optionally omit libtool --- tests/twisted/tools/exec-with-log.sh.in | 6 +++++- tests/twisted/tools/meson.build | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/twisted/tools/exec-with-log.sh.in b/tests/twisted/tools/exec-with-log.sh.in index 3538044..0c82bd8 100755 --- a/tests/twisted/tools/exec-with-log.sh.in +++ b/tests/twisted/tools/exec-with-log.sh.in @@ -26,4 +26,8 @@ elif test -n "$IDLE_TEST_REFDBG"; then fi export G_DEBUG=fatal-warnings" ${G_DEBUG}" -exec @abs_top_builddir@/libtool --mode=execute $IDLE_WRAPPER @abs_top_builddir@/src/telepathy-idle +if test x"@omit_libtool@" = "xyes"; then + exec $IDLE_WRAPPER @abs_top_builddir@/src/telepathy-idle +else + exec @abs_top_builddir@/libtool --mode=execute $IDLE_WRAPPER @abs_top_builddir@/src/telepathy-idle +fi diff --git a/tests/twisted/tools/meson.build b/tests/twisted/tools/meson.build index c3d28b6..fe3a825 100644 --- a/tests/twisted/tools/meson.build +++ b/tests/twisted/tools/meson.build @@ -1,6 +1,7 @@ ewl_conf = configuration_data() ewl_conf.set('abs_top_builddir', abs_top_builddir) ewl_conf.set('abs_top_srcdir', abs_top_srcdir) +ewl_conf.set('omit_libtool', 'yes') configure_file( input: 'exec-with-log.sh.in', -- cgit v1.2.1