Commit f3ce7187 authored by Shane Snyder's avatar Shane Snyder
Browse files

make check tweaks + add stubbed out test case

parent 15aec2b6
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS="-Im4" ACLOCAL_AMFLAGS="-Im4"
# setting this to empty so subdir makefiles can use +=
noinst_HEADERS =
noinst_LTLIBRARIES =
noinst_PROGRAMS =
bin_PROGRAMS = bin_PROGRAMS =
check_PROGRAMS = check_PROGRAMS =
TESTS = TESTS =
...@@ -19,10 +23,6 @@ include_HEADERS = \ ...@@ -19,10 +23,6 @@ include_HEADERS = \
include/librados-mobject-store.h \ include/librados-mobject-store.h \
include/mobject-server.h include/mobject-server.h
# setting this to empty so subdir makefiles can use +=
noinst_HEADERS =
noinst_LTLIBRARIES =
include Make.rules include Make.rules
include $(top_srcdir)/src/Makefile.subdir include $(top_srcdir)/src/Makefile.subdir
......
...@@ -4,17 +4,23 @@ check_PROGRAMS += \ ...@@ -4,17 +4,23 @@ check_PROGRAMS += \
tests/test-sds-keyval-client \ tests/test-sds-keyval-client \
tests/mobject-client-test tests/mobject-client-test
# don't include rados programs in make check
if HAVE_RADOS if HAVE_RADOS
check_PROGRAMS += \ noinst_PROGRAMS += \
tests/rados-mobject-connect-test tests/rados-mobject-connect-test
endif endif
#TESTS += \ TESTS += \
# tests/connect-test.sh tests/mobject-connect-test.sh
tests_mobject_connect_test_SOURCES = tests/mobject-connect-test.c tests_mobject_connect_test_SOURCES = tests/mobject-connect-test.c
tests_mobject_connect_test_CPPFLAGS = -I${srcdir}/include tests_mobject_connect_test_CPPFLAGS = -I${srcdir}/include
tests_mobject_connect_test_LDADD = src/libmobject-store.la ${LIBS} tests_mobject_connect_test_LDADD = src/libmobject-store.la ${LIBS}
if HAVE_RADOS
tests_rados_mobject_connect_test_SOURCES = tests/mobject-connect-test.c
tests_rados_mobject_connect_test_CFLAGS = -DUSE_RADOS
tests_rados_mobject_connect_test_LDADD = -lrados ${LIBS}
endif
tests_mobject_client_test_SOURCES = tests/mobject-client-test.c tests_mobject_client_test_SOURCES = tests/mobject-client-test.c
tests_mobject_client_test_CPPFLAGS = -I${srcdir}/include tests_mobject_client_test_CPPFLAGS = -I${srcdir}/include
...@@ -23,9 +29,3 @@ tests_mobject_client_test_LDADD = src/libmobject-store.la ${LIBS} ...@@ -23,9 +29,3 @@ tests_mobject_client_test_LDADD = src/libmobject-store.la ${LIBS}
tests_mobject_server_CPPFLAGS = -I${srcdir}/include tests_mobject_server_CPPFLAGS = -I${srcdir}/include
tests_mobject_server_LDADD = src/libmobject-server.la ${LIBS} tests_mobject_server_LDADD = src/libmobject-server.la ${LIBS}
if HAVE_RADOS
tests_rados_mobject_connect_test_SOURCES = tests/mobject-connect-test.c
tests_rados_mobject_connect_test_CFLAGS = -DUSE_RADOS
tests_rados_mobject_connect_test_LDADD = -lrados ${LIBS}
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