diff options
Diffstat (limited to 'cpp/src/tests/storePerftools')
18 files changed, 27 insertions, 34 deletions
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp b/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp index cc24500800..75a0223eaa 100644 --- a/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp +++ b/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp @@ -21,14 +21,13 @@ * \file MessageConsumer.cpp */ -#include "MessageConsumer.h" - -#include "TestOptions.h" +#include "tests/storePerftools/asyncPerf/MessageConsumer.h" #include "qpid/broker/SimpleDeliveryRecord.h" #include "qpid/broker/SimpleQueue.h" #include "qpid/broker/SimpleTxnAccept.h" #include "qpid/broker/SimpleTxnBuffer.h" +#include "tests/storePerftools/asyncPerf/TestOptions.h" #include <stdint.h> // uint32_t diff --git a/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp b/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp index f5c47c796d..a5204432ec 100644 --- a/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp +++ b/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp @@ -21,15 +21,14 @@ * \file MessageProducer.cpp */ -#include "MessageProducer.h" - -#include "TestOptions.h" +#include "tests/storePerftools/asyncPerf/MessageProducer.h" #include "qpid/asyncStore/PersistableMessageContext.h" #include "qpid/broker/SimpleMessage.h" #include "qpid/broker/SimpleQueue.h" #include "qpid/broker/SimpleTxnBuffer.h" #include "qpid/broker/SimpleTxnPublish.h" +#include "tests/storePerftools/asyncPerf/TestOptions.h" #include <stdint.h> // uint32_t diff --git a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp index 3cd4eefbd9..fadc531150 100644 --- a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp +++ b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp @@ -21,14 +21,12 @@ * \file PerfTest.cpp */ -#include "PerfTest.h" - -#include "MessageConsumer.h" -#include "MessageProducer.h" - -#include "tests/storePerftools/version.h" +#include "tests/storePerftools/asyncPerf/MessageConsumer.h" +#include "tests/storePerftools/asyncPerf/MessageProducer.h" +#include "tests/storePerftools/asyncPerf/PerfTest.h" #include "tests/storePerftools/common/ScopedTimer.h" #include "tests/storePerftools/common/Thread.h" +#include "tests/storePerftools/version.h" #include "qpid/Modules.h" // Use with loading store as module #include "qpid/asyncStore/AsyncStoreImpl.h" diff --git a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h index 27d8d08faf..0e45bae4aa 100644 --- a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h +++ b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h @@ -24,13 +24,11 @@ #ifndef tests_storePerftools_asyncPerf_PerfTest_h_ #define tests_storePerftools_asyncPerf_PerfTest_h_ -#include "TestResult.h" - -#include "tests/storePerftools/common/Streamable.h" - #include "qpid/broker/AsyncResultQueueImpl.h" #include "qpid/framing/FieldTable.h" #include "qpid/sys/Thread.h" +#include "tests/storePerftools/asyncPerf/TestResult.h" +#include "tests/storePerftools/common/Streamable.h" #include <boost/shared_ptr.hpp> #include <deque> diff --git a/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp b/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp index 20e9c39f1b..3487f8531f 100644 --- a/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp +++ b/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp @@ -21,7 +21,7 @@ * \file TestOptions.cpp */ -#include "TestOptions.h" +#include "tests/storePerftools/asyncPerf/TestOptions.h" namespace tests { namespace storePerftools { diff --git a/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp b/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp index 312fa187b8..2433394a0d 100644 --- a/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp +++ b/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp @@ -21,7 +21,7 @@ * \file TestResult.cpp */ -#include "TestResult.h" +#include "tests/storePerftools/asyncPerf/TestResult.h" namespace tests { namespace storePerftools { diff --git a/cpp/src/tests/storePerftools/asyncPerf/TestResult.h b/cpp/src/tests/storePerftools/asyncPerf/TestResult.h index b2ad49daf7..d1ab5ce929 100644 --- a/cpp/src/tests/storePerftools/asyncPerf/TestResult.h +++ b/cpp/src/tests/storePerftools/asyncPerf/TestResult.h @@ -24,8 +24,7 @@ #ifndef tests_storePerftools_asyncPerf_TestResult_h_ #define tests_storePerftools_asyncPerf_TestResult_h_ -#include "TestOptions.h" - +#include "tests/storePerftools/asyncPerf/TestOptions.h" #include "tests/storePerftools/common/TestResult.h" namespace tests { diff --git a/cpp/src/tests/storePerftools/common/Parameters.h b/cpp/src/tests/storePerftools/common/Parameters.h index cc3bf5d0f6..a844e10344 100644 --- a/cpp/src/tests/storePerftools/common/Parameters.h +++ b/cpp/src/tests/storePerftools/common/Parameters.h @@ -24,7 +24,7 @@ #ifndef tests_storePerftools_common_Parameters_h_ #define tests_storePerftools_common_Parameters_h_ -#include "Streamable.h" +#include "tests/storePerftools/common/Streamable.h" namespace tests { namespace storePerftools { diff --git a/cpp/src/tests/storePerftools/common/PerftoolError.cpp b/cpp/src/tests/storePerftools/common/PerftoolError.cpp index 8830447062..499dde070a 100644 --- a/cpp/src/tests/storePerftools/common/PerftoolError.cpp +++ b/cpp/src/tests/storePerftools/common/PerftoolError.cpp @@ -21,7 +21,7 @@ * \file PerftoolError.cpp */ -#include "PerftoolError.h" +#include "tests/storePerftools/common/PerftoolError.h" #include <iomanip> // std::setfill(), std::setw() diff --git a/cpp/src/tests/storePerftools/common/PerftoolError.h b/cpp/src/tests/storePerftools/common/PerftoolError.h index 268835b58d..6e5473ad3b 100644 --- a/cpp/src/tests/storePerftools/common/PerftoolError.h +++ b/cpp/src/tests/storePerftools/common/PerftoolError.h @@ -24,7 +24,7 @@ #ifndef tests_storePerftools_common_PerftoolError_h_ #define tests_storePerftools_common_PerftoolError_h_ -#include "Streamable.h" +#include "tests/storePerftools/common/Streamable.h" #include <map> #include <stdexcept> // std::runtime_error diff --git a/cpp/src/tests/storePerftools/common/ScopedTimable.cpp b/cpp/src/tests/storePerftools/common/ScopedTimable.cpp index 924879411f..e5cf80cba3 100644 --- a/cpp/src/tests/storePerftools/common/ScopedTimable.cpp +++ b/cpp/src/tests/storePerftools/common/ScopedTimable.cpp @@ -21,7 +21,7 @@ * \file ScopedTimable.cpp */ -#include "ScopedTimable.h" +#include "tests/storePerftools/common/ScopedTimable.h" namespace tests { namespace storePerftools { diff --git a/cpp/src/tests/storePerftools/common/ScopedTimer.cpp b/cpp/src/tests/storePerftools/common/ScopedTimer.cpp index b919ea21ce..50c02d6ef9 100644 --- a/cpp/src/tests/storePerftools/common/ScopedTimer.cpp +++ b/cpp/src/tests/storePerftools/common/ScopedTimer.cpp @@ -21,9 +21,9 @@ * \file ScopedTimer.cpp */ -#include "ScopedTimer.h" +#include "tests/storePerftools/common/ScopedTimer.h" -#include "ScopedTimable.h" +#include "tests/storePerftools/common/ScopedTimable.h" namespace tests { namespace storePerftools { diff --git a/cpp/src/tests/storePerftools/common/Streamable.cpp b/cpp/src/tests/storePerftools/common/Streamable.cpp index 8b5427c508..c409cfbf9c 100644 --- a/cpp/src/tests/storePerftools/common/Streamable.cpp +++ b/cpp/src/tests/storePerftools/common/Streamable.cpp @@ -21,7 +21,7 @@ * \file Streamable.cpp */ -#include "Streamable.h" +#include "tests/storePerftools/common/Streamable.h" #include <sstream> diff --git a/cpp/src/tests/storePerftools/common/TestOptions.cpp b/cpp/src/tests/storePerftools/common/TestOptions.cpp index c0c8b284d3..cb1895ecd1 100644 --- a/cpp/src/tests/storePerftools/common/TestOptions.cpp +++ b/cpp/src/tests/storePerftools/common/TestOptions.cpp @@ -21,7 +21,7 @@ * \file TestOptions.cpp */ -#include "TestOptions.h" +#include "tests/storePerftools/common/TestOptions.h" namespace tests { namespace storePerftools { diff --git a/cpp/src/tests/storePerftools/common/TestParameters.cpp b/cpp/src/tests/storePerftools/common/TestParameters.cpp index e418eedefb..dee8cff80b 100644 --- a/cpp/src/tests/storePerftools/common/TestParameters.cpp +++ b/cpp/src/tests/storePerftools/common/TestParameters.cpp @@ -21,7 +21,7 @@ * \file TestParameters.cpp */ -#include "TestParameters.h" +#include "tests/storePerftools/common/TestParameters.h" #include <cstdlib> // std::atoi, std::atol diff --git a/cpp/src/tests/storePerftools/common/TestParameters.h b/cpp/src/tests/storePerftools/common/TestParameters.h index c9ebc8cefa..f950d27487 100644 --- a/cpp/src/tests/storePerftools/common/TestParameters.h +++ b/cpp/src/tests/storePerftools/common/TestParameters.h @@ -24,7 +24,7 @@ #ifndef tests_storePerftools_common_TestParameters_h_ #define tests_storePerftools_common_TestParameters_h_ -#include "Parameters.h" +#include "tests/storePerftools/common/Parameters.h" #include <stdint.h> // uint16_t, uint32_t diff --git a/cpp/src/tests/storePerftools/common/TestResult.h b/cpp/src/tests/storePerftools/common/TestResult.h index 5092477397..7ee70a7ebe 100644 --- a/cpp/src/tests/storePerftools/common/TestResult.h +++ b/cpp/src/tests/storePerftools/common/TestResult.h @@ -24,8 +24,8 @@ #ifndef tests_storePerftools_common_TestResult_h_ #define tests_storePerftools_common_TestResult_h_ -#include "ScopedTimable.h" -#include "Streamable.h" +#include "tests/storePerftools/common/ScopedTimable.h" +#include "tests/storePerftools/common/Streamable.h" namespace tests { namespace storePerftools { diff --git a/cpp/src/tests/storePerftools/common/Thread.cpp b/cpp/src/tests/storePerftools/common/Thread.cpp index cab7d77297..9bc0777c47 100644 --- a/cpp/src/tests/storePerftools/common/Thread.cpp +++ b/cpp/src/tests/storePerftools/common/Thread.cpp @@ -21,9 +21,9 @@ * \file Thread.cpp */ -#include "Thread.h" +#include "tests/storePerftools/common/Thread.h" -#include "PerftoolError.h" +#include "tests/storePerftools/common/PerftoolError.h" namespace tests { namespace storePerftools { |