X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Ftest%2Fjournal%2Ftest_Journaler.cc;h=529141de9a3078b237a53d6c51a3ec15f332c471;hb=31f18b776d001752a193a7cec8bb49033c1a904c;hp=4fd06ad6535f52674f686a812dc9081e5c3c8b5e;hpb=40152f1e46a80b3405e5558a442ee632198dfd24;p=ceph.git diff --git a/ceph/src/test/journal/test_Journaler.cc b/ceph/src/test/journal/test_Journaler.cc index 4fd06ad65..529141de9 100644 --- a/ceph/src/test/journal/test_Journaler.cc +++ b/ceph/src/test/journal/test_Journaler.cc @@ -1,13 +1,18 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab +#include "include/stringify.h" + #include "journal/Journaler.h" #include "journal/Settings.h" -#include "include/stringify.h" -#include "gtest/gtest.h" + #include "test/librados/test.h" #include "test/journal/RadosTestFixture.h" -#include "include/stringify.h" + +#include "gtest/gtest.h" + +// reinclude our assert to clobber the system one +#include "include/assert.h" class TestJournaler : public RadosTestFixture { public: