mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2918_cygwin_test_build' into 4.8.1-stable

Browse Source 
* 2918_cygwin_test_build:
  Ticket #2918: cygwin test failure.
This commit is contained in:
Andrew Borodin 2012-11-14 13:36:04 +04:00
commit b7503b878a
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
m4.include/mc-tests.m4
View File

@ -22,4 +22,16 @@ AC_DEFUN([MC_UNIT_TESTS],[
[AC_MSG_WARN(['Check' utility not found. Check your environment])]) [AC_MSG_WARN(['Check' utility not found. Check your environment])])
fi fi
AM_CONDITIONAL(HAVE_TESTS, test x"$have_check" = "xyes") AM_CONDITIONAL(HAVE_TESTS, test x"$have_check" = "xyes")
# on cygwin, the linker does not accept the "-z" option
case $host_os in
cygwin*)
TESTS_LDFLAGS="-Wl,--allow-multiple-definition"
;;
*)
TESTS_LDFLAGS="-Wl,-z,muldefs"
;;
esac
AC_SUBST(TESTS_LDFLAGS)
]) ])

2
tests/lib/mcconfig/Makefile.am
View File

@ -2,7 +2,7 @@
AM_CPPFLAGS = -DWORKDIR=\"$(abs_builddir)\" AM_CPPFLAGS = -DWORKDIR=\"$(abs_builddir)\"
AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) @CHECK_CFLAGS@ AM_CFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) @CHECK_CFLAGS@
AM_LDFLAGS = -Wl,-z,muldefs AM_LDFLAGS = @TESTS_LDFLAGS@
LIBS=@CHECK_LIBS@ $(top_builddir)/lib/libmc.la LIBS=@CHECK_LIBS@ $(top_builddir)/lib/libmc.la

2
tests/lib/vfs/Makefile.am
View File

@ -2,7 +2,7 @@
AM_CPPFLAGS = -DTEST_SHARE_DIR=\"$(abs_srcdir)\" AM_CPPFLAGS = -DTEST_SHARE_DIR=\"$(abs_srcdir)\"
AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib/vfs $(GLIB_CFLAGS) @CHECK_CFLAGS@ AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib/vfs $(GLIB_CFLAGS) @CHECK_CFLAGS@
AM_LDFLAGS = -Wl,-z,muldefs AM_LDFLAGS = @TESTS_LDFLAGS@
EXTRA_DIST = mc.charsets EXTRA_DIST = mc.charsets

2
tests/src/filemanager/Makefile.am
View File

@ -1,6 +1,6 @@
AM_CFLAGS = -I$(top_srcdir)/lib/vfs $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@ AM_CFLAGS = -I$(top_srcdir)/lib/vfs $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@
AM_LDFLAGS = -Wl,-z,muldefs AM_LDFLAGS = @TESTS_LDFLAGS@
LIBS=@CHECK_LIBS@ \ LIBS=@CHECK_LIBS@ \
$(top_builddir)/lib/libmc.la $(top_builddir)/lib/libmc.la