aboutsummaryrefslogtreecommitdiff
path: root/tests/framework
diff options
context:
space:
mode:
authorVidhya Sudhan Loganathan <vidhyasudhan.loganathan@arm.com>2018-10-08 08:59:03 +0100
committerAnthony Barbier <anthony.barbier@arm.com>2018-11-02 16:55:19 +0000
commite95c206df8f8eac0b81f42526e5828b557172c16 (patch)
tree8cd0bf1b9984f17fe9a1f1f65a92a2af6d24903f /tests/framework
parentf02e52796c3e2bd4a88b696cbe8415cd36884c12 (diff)
downloadComputeLibrary-e95c206df8f8eac0b81f42526e5828b557172c16.tar.gz
COMPMID-1622 : (Nightly) Seg fault on android
conditionally compile the std::cout that was causing the fault Change-Id: I7f50151ab88f19ed6eec1be11ca975614653e359 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/151762 Reviewed-by: Pablo Tello <pablo.tello@arm.com> Tested-by: bsgcomp <bsgcomp@arm.com>
Diffstat (limited to 'tests/framework')
-rw-r--r--tests/framework/Framework.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/framework/Framework.cpp b/tests/framework/Framework.cpp
index 1d889f3728..2452fd670a 100644
--- a/tests/framework/Framework.cpp
+++ b/tests/framework/Framework.cpp
@@ -42,7 +42,9 @@ namespace framework
{
Framework::Framework()
{
+#if defined(__linux__) && !defined(__ANDROID__)
print_cpu_info(std::cout);
+#endif /*#if defined(__linux__) && !defined(__ANDROID__)*/
_available_instruments.emplace(std::pair<InstrumentType, ScaleFactor>(InstrumentType::WALL_CLOCK_TIMER, ScaleFactor::NONE), Instrument::make_instrument<WallClockTimer, ScaleFactor::NONE>);
_available_instruments.emplace(std::pair<InstrumentType, ScaleFactor>(InstrumentType::WALL_CLOCK_TIMER, ScaleFactor::TIME_MS), Instrument::make_instrument<WallClockTimer, ScaleFactor::TIME_MS>);
_available_instruments.emplace(std::pair<InstrumentType, ScaleFactor>(InstrumentType::WALL_CLOCK_TIMER, ScaleFactor::TIME_S), Instrument::make_instrument<WallClockTimer, ScaleFactor::TIME_S>);
@@ -142,6 +144,7 @@ bool Framework::has_test_info() const
return !_test_info.empty();
}
+#if defined(__linux__) && !defined(__ANDROID__)
void Framework::print_cpu_info(std::ostream &os) const
{
const arm_compute::CPUInfo &cpu_info = Scheduler::get().cpu_info();
@@ -153,6 +156,7 @@ void Framework::print_cpu_info(std::ostream &os) const
os << "CPU" << j << " : " << cpu_model_to_string(model) << std::endl;
}
}
+#endif /*#if defined(__linux__) && !defined(__ANDROID__)*/
void Framework::print_test_info(std::ostream &os) const
{