mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

Disable stand-alone tests that require dlopen' when --disable-shared'.

Browse source 
* configure.ac (HAVE_SHARED_LIBRARIES): New Automake conditional.

* test-suite/standalone/Makefile.am (check_SCRIPTS): Add `test-asmobs',
  `test-ffi', and `test-extensions' only when `HAVE_SHARED_LIBRARIES'.
This commit is contained in:
Ludovic Courtès 2011-01-31 19:26:01 +01:00
parent a8591a55f0
commit 2ddf085149
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
configure.ac
View file

@ -4,7 +4,8 @@ dnl
define(GUILE_CONFIGURE_COPYRIGHT,[[ define(GUILE_CONFIGURE_COPYRIGHT,[[
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GUILE This file is part of GUILE
@ -75,6 +76,8 @@ AM_PROG_CC_C_O
AC_LIBTOOL_DLOPEN AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AM_CONDITIONAL([HAVE_SHARED_LIBRARIES], [test "x$enable_shared" = "xyes"])
dnl Check for libltdl. dnl Check for libltdl.
AC_LIB_HAVE_LINKFLAGS([ltdl], [], [#include <ltdl.h>], AC_LIB_HAVE_LINKFLAGS([ltdl], [], [#include <ltdl.h>],
[lt_dlopenext ("foo");]) [lt_dlopenext ("foo");])

11
test-suite/standalone/Makefile.am
View file

@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in. ## Process this file with automake to produce Makefile.in.
## ##
## Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Software Foundation, Inc. ## Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
## 2011 Free Software Foundation, Inc.
## ##
## This file is part of GUILE. ## This file is part of GUILE.
## ##
@ -78,6 +79,8 @@ test_round_LDADD = ${top_builddir}/libguile/libguile-@GUILE_EFFECTIVE_VERSION@.l
check_PROGRAMS += test-round check_PROGRAMS += test-round
TESTS += test-round TESTS += test-round
if HAVE_SHARED_LIBRARIES
# test-asmobs # test-asmobs
noinst_LTLIBRARIES += libtest-asmobs.la noinst_LTLIBRARIES += libtest-asmobs.la
libtest_asmobs_la_SOURCES = test-asmobs-lib.c libtest_asmobs_la_SOURCES = test-asmobs-lib.c
@ -97,6 +100,8 @@ libtest_ffi_la_LIBADD = ${top_builddir}/libguile/libguile-@GUILE_EFFECTIVE_VERSI
check_SCRIPTS += test-ffi check_SCRIPTS += test-ffi
TESTS += test-ffi TESTS += test-ffi
endif HAVE_SHARED_LIBRARIES
# test-list # test-list
test_list_SOURCES = test-list.c test_list_SOURCES = test-list.c
test_list_CFLAGS = ${test_cflags} test_list_CFLAGS = ${test_cflags}
@ -154,6 +159,8 @@ test_scm_take_u8vector_LDADD = ${top_builddir}/libguile/libguile-@GUILE_EFFECTIV
check_PROGRAMS += test-scm-take-u8vector check_PROGRAMS += test-scm-take-u8vector
TESTS += test-scm-take-u8vector TESTS += test-scm-take-u8vector
if HAVE_SHARED_LIBRARIES
# test-extensions # test-extensions
noinst_LTLIBRARIES += libtest-extensions.la noinst_LTLIBRARIES += libtest-extensions.la
libtest_extensions_la_SOURCES = test-extensions-lib.c libtest_extensions_la_SOURCES = test-extensions-lib.c
@ -163,6 +170,8 @@ libtest_extensions_la_LIBADD = ${top_builddir}/libguile/libguile-@GUILE_EFFECTIV
check_SCRIPTS += test-extensions check_SCRIPTS += test-extensions
TESTS += test-extensions TESTS += test-extensions
endif HAVE_SHARED_LIBRARIES
if BUILD_PTHREAD_SUPPORT if BUILD_PTHREAD_SUPPORT
# test-with-guile-module # test-with-guile-module