diff options
| author | Matt Benjamin <matt@cohortfs.com> | 2015-01-10 21:17:59 +0100 |
|---|---|---|
| committer | Matt Benjamin <matt@cohortfs.com> | 2015-01-14 22:44:47 +0100 |
| commit | 45e9cd5bd4769d5e64c9a53a5a29096f81fbae30 (patch) | |
| tree | 831162a3b5ce80095dac97136db863cf713ad6bb /src/test/messenger | |
| parent | xio: enable accelio debug on level 2 (diff) | |
| download | ceph-45e9cd5bd4769d5e64c9a53a5a29096f81fbae30.tar.xz ceph-45e9cd5bd4769d5e64c9a53a5a29096f81fbae30.zip | |
Fix make check blockers.
Replace ceph-helpers.sh check for ms_nocrc with the new formula
for this. Fixes make check for default build.
Additionally, fix linkage of several unittests when building with
--enable-xio.
xio: add missing noinst headers
The common/address_helper.h file was not mentioned, also
msg/xio/XioSubmit.h.
Fix for Message.cc compilation error when Xio disabled.
Mention simple_dispatcher.h and xio_dispatcher.h in noinst_HEADERS.
xio: require boost-regex.
Make address_helper conditional on Xio.
This carries over to simple_client/simple_server,
for convenience.
Signed-off-by: Matt Benjamin <matt@cohortfs.com>
Diffstat (limited to 'src/test/messenger')
| -rw-r--r-- | src/test/messenger/Makefile.am | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/test/messenger/Makefile.am b/src/test/messenger/Makefile.am index 27a4b68dc61..1449cbc9f77 100644 --- a/src/test/messenger/Makefile.am +++ b/src/test/messenger/Makefile.am @@ -1,3 +1,8 @@ +if ENABLE_XIO + +noinst_HEADERS += \ + test/messenger/message_helper.h \ + test/messenger/simple_dispatcher.h simple_server_SOURCES = \ test/messenger/simple_server.cc \ @@ -31,7 +36,9 @@ noinst_PROGRAMS += \ simple_server \ simple_client -if ENABLE_XIO +noinst_HEADERS += \ + test/messenger/xio_dispatcher.h + xio_server_SOURCES = \ test/messenger/xio_server.cc \ test/messenger/xio_dispatcher.cc @@ -63,4 +70,5 @@ endif noinst_PROGRAMS += \ xio_server \ xio_client + endif |