Commit ea6ff6b0 authored by Matthieu Dorier's avatar Matthieu Dorier

Merge branch 'master' of xgitlab.cels.anl.gov:sds/margo

parents 1927bb5c 016dbdce
......@@ -33,11 +33,12 @@ AC_ARG_VAR([MKTEMP], mktemp program)
if test -z "$TIMEOUT" ; then
AC_CHECK_PROGS(TIMEOUT, [timeout gtimeout])
if test -z "$TIMEOUT" ; then
AC_MSG_ERROR([Could not find timeout command (can optionally provide via the TIMEOUT variable)])
AC_MSG_WARN([Could not find timeout command (can optionally provide via the TIMEOUT variable): tests disabled])
fi
else
AC_SUBST([TIMEOUT], ["$TIMEOUT"])
fi
AM_CONDITIONAL([BUILD_TESTS], [test x$TIMEOUT != x])
if test -z "$MKTEMP" ; then
AC_CHECK_PROGS(MKTEMP, [mktemp gmktemp])
......
......@@ -2,6 +2,8 @@ TESTS_ENVIRONMENT += \
TIMEOUT="$(TIMEOUT)" \
MKTEMP="$(MKTEMP)"
# disable tests if there is no timeout command
if BUILD_TESTS
check_PROGRAMS += \
tests/margo-test-sleep \
tests/margo-test-server \
......@@ -25,4 +27,4 @@ EXTRA_DIST += \
tests_margo_test_server_SOURCES = \
tests/margo-test-server.c \
tests/my-rpc.c
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment