5 files changed, 15 insertions, 12 deletions
diff --git a/tests/framework/instruments/OpenCLMemoryUsage.cpp b/tests/framework/instruments/OpenCLMemoryUsage.cpp
index 119ad4cad2..7b08e2d85b 100644
--- a/tests/framework/instruments/OpenCLMemoryUsage.cpp
+++ b/tests/framework/instruments/OpenCLMemoryUsage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -192,7 +192,7 @@ Instrument::MeasurementsMap OpenCLMemoryUsage::test_measurements() const
 
     size_t num_programs = CLKernelLibrary::get().get_built_programs().size();
     size_t total_size   = 0;
-    for(auto it : CLKernelLibrary::get().get_built_programs())
+    for(auto const &it : CLKernelLibrary::get().get_built_programs())
     {
         std::vector<size_t> binary_sizes = it.second.getInfo<CL_PROGRAM_BINARY_SIZES>();
         total_size                       = std::accumulate(binary_sizes.begin(), binary_sizes.end(), total_size);
diff --git a/tests/framework/instruments/OpenCLTimer.cpp b/tests/framework/instruments/OpenCLTimer.cpp
index ca859b6fd9..ca4c13ce61 100644
--- a/tests/framework/instruments/OpenCLTimer.cpp
+++ b/tests/framework/instruments/OpenCLTimer.cpp
@@ -185,9 +185,12 @@ Instrument::MeasurementsMap OpenCLClock<output_timestamps>::measurements() const
 {
     MeasurementsMap measurements;
     unsigned int    kernel_number = 0;
-    for(auto kernel : _kernels)
+    for(auto const &kernel : _kernels)
     {
-        cl_ulong queued, flushed, start, end;
+        cl_ulong queued;
+        cl_ulong flushed;
+        cl_ulong start;
+        cl_ulong end;
         kernel.event.getProfilingInfo(CL_PROFILING_COMMAND_QUEUED, &queued);
         kernel.event.getProfilingInfo(CL_PROFILING_COMMAND_SUBMIT, &flushed);
         kernel.event.getProfilingInfo(CL_PROFILING_COMMAND_START, &start);
diff --git a/tests/framework/instruments/SchedulerTimer.cpp b/tests/framework/instruments/SchedulerTimer.cpp
index f9d4dd5fce..c114dfbd9d 100644
--- a/tests/framework/instruments/SchedulerTimer.cpp
+++ b/tests/framework/instruments/SchedulerTimer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -67,9 +67,9 @@ public:
         return _real_scheduler.num_threads();
     }
 
-    void set_prefix(std::string prefix)
+    void set_prefix(const std::string &prefix)
     {
-        _prefix = std::move(prefix);
+        _prefix = prefix;
     }
 
     void schedule(ICPPKernel *kernel, const Hints &hints) override
@@ -188,7 +188,7 @@ Instrument::MeasurementsMap SchedulerClock<output_timestamps>::measurements() co
         if(output_timestamps)
         {
             ARM_COMPUTE_ERROR_ON(kernel.measurements.size() != 2);
-            for(auto m : kernel.measurements)
+            for(auto const &m : kernel.measurements)
             {
                 if(m.first.find("[start]") != std::string::npos)
                 {
diff --git a/tests/framework/printers/JSONPrinter.cpp b/tests/framework/printers/JSONPrinter.cpp
index 6b982f5bb0..179cdf9601 100644
--- a/tests/framework/printers/JSONPrinter.cpp
+++ b/tests/framework/printers/JSONPrinter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -117,7 +117,7 @@ void JSONPrinter::print_list_tests(const std::vector<TestInfo> &infos)
 {
     *_stream << R"(, "list_tests" : {)";
     bool first = true;
-    for(auto info : infos)
+    for(auto const &info : infos)
     {
         if(!first)
         {
diff --git a/tests/framework/printers/PrettyPrinter.cpp b/tests/framework/printers/PrettyPrinter.cpp
index 318195109c..fe0540a624 100644
--- a/tests/framework/printers/PrettyPrinter.cpp
+++ b/tests/framework/printers/PrettyPrinter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -111,7 +111,7 @@ void PrettyPrinter::print_error(const std::exception &error, bool expected)
 
 void PrettyPrinter::print_list_tests(const std::vector<TestInfo> &infos)
 {
-    for(auto info : infos)
+    for(auto const &info : infos)
     {
         *_stream << "[" << info.id << ", " << info.mode << ", " << info.status << "] " << info.name << "\n";
     }