From 557d4aece64b2ed422ec853dbc2b7a4949ea56ca Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Thu, 18 Apr 2019 18:10:34 +0100 Subject: COMPMID-1995: Fix Disabled suite in test framework. Change-Id: I6b22a002e946e948b9dda4964d3516994e057dd6 Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/1012 Reviewed-by: Anthony Barbier Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- tests/framework/TestFilter.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/framework/TestFilter.cpp') diff --git a/tests/framework/TestFilter.cpp b/tests/framework/TestFilter.cpp index 0af40c1717..f392aa7070 100644 --- a/tests/framework/TestFilter.cpp +++ b/tests/framework/TestFilter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -42,7 +42,8 @@ TestFilter::TestFilter(DatasetMode mode, const std::string &name_filter, const s bool TestFilter::is_selected(const TestInfo &info) const { - if((info.mode & _dataset_mode) == DatasetMode::DISABLED) + const bool include_disabled = (info.mode == _dataset_mode) && (_dataset_mode == DatasetMode::DISABLED); + if((info.mode & _dataset_mode) == DatasetMode::DISABLED && !include_disabled) { return false; } -- cgit v1.2.1