Changes in / [795:921d5bf41ac2:796:9cc6e98c487d] in lemon-main

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• scripts/Makefile.am (added)
• scripts/bootstrap.sh (modified) (2 diffs)
• scripts/valgrind-wrapper.sh (added)
• test/Makefile.am (modified) (1 diff)

Makefile.am

@@ -45 +45 @@
 include doc/Makefile.am
 include tools/Makefile.am
+include scripts/Makefile.am
 
 DIST_SUBDIRS = demo

configure.ac

@@ -84 +84 @@
 AM_CONDITIONAL([WANT_TOOLS], [test x"$enable_tools" != x"no"])
 
+dnl Support for running test cases using valgrind.
+use_valgrind=no
+AC_ARG_ENABLE([valgrind],
+AS_HELP_STRING([--enable-valgrind], [use valgrind when running tests]),
+              [use_valgrind=yes])
+
+if [[ "$use_valgrind" = "yes" ]]; then
+  AC_CHECK_PROG(HAVE_VALGRIND, valgrind, yes, no)
+
+  if [[ "$HAVE_VALGRIND" = "no" ]]; then
+    AC_MSG_ERROR([Valgrind not found in PATH.])
+  fi
+fi
+AM_CONDITIONAL(USE_VALGRIND, [test "$use_valgrind" = "yes"])
+
 dnl Checks for header files.
 AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h)
@@ -129 +144 @@
 echo
 echo Build additional tools........ : $enable_tools
+echo Use valgrind for tests........ : $use_valgrind
 echo
 echo The packace will be installed in

scripts/bootstrap.sh

@@ -103 +103 @@
 cxx_flags="CXXFLAGS=-ggdb$opt_flags$werror_flags"
 
+if yesorno "Check with valgrind" "n" 
+then
+    valgrind_flags=' --enable-valgrind'
+else
+    valgrind_flags=''
+fi
+
 if [ -f ${COIN_OR_PREFIX}/include/coin/config_coinutils.h ]; then
     if yesorno "Use COIN-OR (CBC/CLP)" "n"
@@ -129 +136 @@
 fi
 ${CONFIGURE_PATH}/configure --prefix=$LEMON_INSTALL_PREFIX \
+$valgrind_flags \
 "$cxx_flags" \
 $coin_flag \

test/Makefile.am

@@ +1 @@
+if USE_VALGRIND
+TESTS_ENVIRONMENT=$(top_srcdir)/scripts/valgrind-wrapper.sh
+endif
+
 EXTRA_DIST += \
         test/CMakeLists.txt