diff options
| author | Finn Williams <Finn.Williams@arm.com> | 2020-05-07 10:38:15 +0100 |
|---|---|---|
| committer | Jim Flynn <jim.flynn@arm.com> | 2020-05-12 22:00:17 +0000 |
| commit | 0c8cb99db6dd8b1ea073ef7227b2872a3cb0b269 (patch) | |
| tree | 3a2301175e09d7e6f2f5feb2d8c6f8a184493b4c /tests | |
| parent | d6cb30e7052891996efa41f608fffe4fa62d2094 (diff) | |
| download | armnn-0c8cb99db6dd8b1ea073ef7227b2872a3cb0b269.tar.gz | |
IVGCVSW-4731 Move Packet.hpp to profiling/common/include
* Refactor profiling cmake to fix inconsistencies/issues with includes
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I0836762d4c72e25754a28162ec54c8e332422a02
Diffstat (limited to 'tests')
6 files changed, 8 insertions, 9 deletions
diff --git a/tests/profiling/gatordmock/CounterDirectory.hpp b/tests/profiling/gatordmock/CounterDirectory.hpp index 528c037cbf..31718dd817 100644 --- a/tests/profiling/gatordmock/CounterDirectory.hpp +++ b/tests/profiling/gatordmock/CounterDirectory.hpp @@ -9,7 +9,7 @@ #include "GatordMockService.hpp" #include "MockUtils.hpp" -#include "Packet.hpp" +#include <Packet.hpp> #include "CommandHandlerFunctor.hpp" #include "SendCounterPacket.hpp" #include "IPeriodicCounterCapture.hpp" diff --git a/tests/profiling/gatordmock/GatordMockMain.cpp b/tests/profiling/gatordmock/GatordMockMain.cpp index 0dbddeb048..5d6e8869f6 100644 --- a/tests/profiling/gatordmock/GatordMockMain.cpp +++ b/tests/profiling/gatordmock/GatordMockMain.cpp @@ -5,9 +5,10 @@ #include "CommandFileParser.hpp" #include "CommandLineProcessor.hpp" -#include <ConnectionHandler.hpp> #include "GatordMockService.hpp" +#include <ConnectionHandler.hpp> + #include <string> #include <signal.h> diff --git a/tests/profiling/gatordmock/GatordMockService.cpp b/tests/profiling/gatordmock/GatordMockService.cpp index 53974fec3f..13f688225b 100644 --- a/tests/profiling/gatordmock/GatordMockService.cpp +++ b/tests/profiling/gatordmock/GatordMockService.cpp @@ -8,7 +8,7 @@ #include <CommandHandlerRegistry.hpp> #include <PacketVersionResolver.hpp> #include <ProfilingUtils.hpp> -#include <common/include/NetworkSockets.hpp> +#include <NetworkSockets.hpp> #include <armnn/utility/Assert.hpp> diff --git a/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.cpp b/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.cpp index 645b0b3507..2c2e71170a 100644 --- a/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.cpp +++ b/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.cpp @@ -5,7 +5,7 @@ #include "PeriodicCounterSelectionResponseHandler.hpp" -#include "../../../src/profiling/ProfilingUtils.hpp" +#include <ProfilingUtils.hpp> #include <iostream> diff --git a/tests/profiling/gatordmock/StreamMetadataCommandHandler.cpp b/tests/profiling/gatordmock/StreamMetadataCommandHandler.cpp index 09255a57a1..d97925cc15 100644 --- a/tests/profiling/gatordmock/StreamMetadataCommandHandler.cpp +++ b/tests/profiling/gatordmock/StreamMetadataCommandHandler.cpp @@ -7,9 +7,6 @@ #include <ProfilingUtils.hpp> -#include <boost/cast.hpp> - -#include <sstream> #include <iostream> using namespace armnn::profiling; diff --git a/tests/profiling/gatordmock/tests/GatordMockTests.cpp b/tests/profiling/gatordmock/tests/GatordMockTests.cpp index cdedeeb897..98ca8ffe90 100644 --- a/tests/profiling/gatordmock/tests/GatordMockTests.cpp +++ b/tests/profiling/gatordmock/tests/GatordMockTests.cpp @@ -6,7 +6,7 @@ #include <CommandHandlerRegistry.hpp> #include <ConnectionHandler.hpp> #include <DirectoryCaptureCommandHandler.hpp> -#include <gatordmock/GatordMockService.hpp> +#include <GatordMockService.hpp> #include <LabelsAndEventClasses.hpp> #include <ProfilingService.hpp> #include <TimelinePacketWriterFactory.hpp> @@ -15,7 +15,8 @@ #include <TimelineDecoder.hpp> #include <Runtime.hpp> -#include "../../src/backends/backendsCommon/test/MockBackend.hpp" + +#include <MockBackend.hpp> #include <boost/cast.hpp> #include <boost/test/test_tools.hpp> |