From e95c206df8f8eac0b81f42526e5828b557172c16 Mon Sep 17 00:00:00 2001 From: Vidhya Sudhan Loganathan Date: Mon, 8 Oct 2018 08:59:03 +0100 Subject: 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 Tested-by: bsgcomp --- tests/framework/Framework.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests') 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::WALL_CLOCK_TIMER, ScaleFactor::NONE), Instrument::make_instrument); _available_instruments.emplace(std::pair(InstrumentType::WALL_CLOCK_TIMER, ScaleFactor::TIME_MS), Instrument::make_instrument); _available_instruments.emplace(std::pair(InstrumentType::WALL_CLOCK_TIMER, ScaleFactor::TIME_S), Instrument::make_instrument); @@ -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 { -- cgit v1.2.1