diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-04-18 18:10:34 +0100 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-04-23 10:30:17 +0000 |
| commit | 557d4aece64b2ed422ec853dbc2b7a4949ea56ca (patch) | |
| tree | f92b31556f18e66873fc9bdbc8302b129a14cc1a | |
| parent | 7179837ac9ef82c6f784aaee999be347bc7764fd (diff) | |
| download | ComputeLibrary-557d4aece64b2ed422ec853dbc2b7a4949ea56ca.tar.gz | |
COMPMID-1995: Fix Disabled suite in test framework.
Change-Id: I6b22a002e946e948b9dda4964d3516994e057dd6
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1012
Reviewed-by: Anthony Barbier <Anthony.barbier@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
| -rw-r--r-- | tests/framework/DatasetModes.cpp | 3 | ||||
| -rw-r--r-- | tests/framework/DatasetModes.h | 5 | ||||
| -rw-r--r-- | tests/framework/TestFilter.cpp | 5 | ||||
| -rw-r--r-- | tests/main.cpp | 1 |
4 files changed, 10 insertions, 4 deletions
diff --git a/tests/framework/DatasetModes.cpp b/tests/framework/DatasetModes.cpp index 3f747df747..0224bd8ede 100644 --- a/tests/framework/DatasetModes.cpp +++ b/tests/framework/DatasetModes.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -38,6 +38,7 @@ DatasetMode dataset_mode_from_name(const std::string &name) static const std::map<std::string, DatasetMode> modes = { { "all", DatasetMode::ALL }, + { "disabled", DatasetMode::DISABLED }, { "precommit", DatasetMode::PRECOMMIT }, { "nightly", DatasetMode::NIGHTLY }, }; diff --git a/tests/framework/DatasetModes.h b/tests/framework/DatasetModes.h index 27638b0504..c970550d01 100644 --- a/tests/framework/DatasetModes.h +++ b/tests/framework/DatasetModes.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -78,6 +78,9 @@ inline ::std::ostream &operator<<(::std::ostream &stream, DatasetMode mode) { switch(mode) { + case DatasetMode::DISABLED: + stream << "DISABLED"; + break; case DatasetMode::PRECOMMIT: stream << "PRECOMMIT"; break; 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; } diff --git a/tests/main.cpp b/tests/main.cpp index b02c9f87e5..0eca0c8f1b 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -110,6 +110,7 @@ int main(int argc, char **argv) std::set<framework::DatasetMode> allowed_modes { + framework::DatasetMode::DISABLED, framework::DatasetMode::PRECOMMIT, framework::DatasetMode::NIGHTLY, framework::DatasetMode::ALL |