From 48963babff704f3e2dc9b263861486a061b7fa2d Mon Sep 17 00:00:00 2001 From: Haomai Wang Date: Wed, 21 Jan 2015 00:59:28 +0800 Subject: [PATCH] test_msgr: Rename unittest_msgr to ceph_test_msgr Because ceph_test_msgr will run a lot of times than unittest expected, move it into qa suites. Signed-off-by: Haomai Wang --- src/test/Makefile.am | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/test/Makefile.am b/src/test/Makefile.am index a1620fc2a1e..8e1aeaed2f1 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -32,6 +32,11 @@ ceph_test_async_driver_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) ceph_test_async_driver_CXXFLAGS = $(UNITTEST_CXXFLAGS) bin_DEBUGPROGRAMS += ceph_test_async_driver +ceph_test_msgr_SOURCES = test/msgr/test_msgr.cc +ceph_test_msgr_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) +ceph_test_msgr_CXXFLAGS = $(UNITTEST_CXXFLAGS) +bin_DEBUGPROGRAMS += ceph_test_msgr + ceph_streamtest_SOURCES = test/streamtest.cc ceph_streamtest_LDADD = $(LIBOS) $(CEPH_GLOBAL) bin_DEBUGPROGRAMS += ceph_streamtest @@ -656,13 +661,6 @@ unittest_readahead_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_readahead_CXXFLAGS = $(UNITTEST_CXXFLAGS) -O2 check_PROGRAMS += unittest_readahead -unittest_msgr_SOURCES = test/msgr/test_msgr.cc -unittest_msgr_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -unittest_msgr_CXXFLAGS = $(UNITTEST_CXXFLAGS) -# restore once http://tracker.ceph.com/issues/10494 is fixed -#check_PROGRAMS += unittest_msgr -bin_DEBUGPROGRAMS += unittest_msgr - unittest_tableformatter_SOURCES = test/common/test_tableformatter.cc unittest_tableformatter_CXXFLAGS = $(UNITTEST_CXXFLAGS) unittest_tableformatter_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) -- 2.47.3