summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorJason Dillaman <dillaman@redhat.com>2017-12-12 16:11:09 +0100
committerGitHub <noreply@github.com>2017-12-12 16:11:09 +0100
commit722795de5acb45053bb1d6d05f31fc48ac578680 (patch)
tree8cbaa8d0e49f81d6e9d6e815b6f5e003b1ac26db /src/test
parentMerge pull request #19437 from trociny/wip-mock-valgrind (diff)
parentlibrbd: Do not instantiate TrimRequest template class (diff)
downloadceph-722795de5acb45053bb1d6d05f31fc48ac578680.tar.xz
ceph-722795de5acb45053bb1d6d05f31fc48ac578680.zip
Merge pull request #19402 from b-ranto/wip-fix-arm-build
test/librbd: Do not instantiate TrimRequest template class Reviewed-by: Kefu Chai <kchai@redhat.com> Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Diffstat (limited to 'src/test')
-rw-r--r--src/test/librbd/operation/test_mock_ResizeRequest.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/test/librbd/operation/test_mock_ResizeRequest.cc b/src/test/librbd/operation/test_mock_ResizeRequest.cc
index e67f8a2a832..7b70a50e8f4 100644
--- a/src/test/librbd/operation/test_mock_ResizeRequest.cc
+++ b/src/test/librbd/operation/test_mock_ResizeRequest.cc
@@ -44,7 +44,6 @@ TrimRequest<MockImageCtx> *TrimRequest<MockImageCtx>::s_instance = nullptr;
// template definitions
#include "librbd/operation/ResizeRequest.cc"
-#include "librbd/operation/TrimRequest.cc"
namespace librbd {
namespace operation {