From 81527bff7d6fc337fb9edec23c0b63a96b500bd4 Mon Sep 17 00:00:00 2001 From: Moritz Pflanzer Date: Thu, 20 Jul 2017 15:11:33 +0100 Subject: COMPMID-415: Don't use regex for filter by test id Change-Id: I9c20e0656f5262d22efeace155c49765627df2b4 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/81191 Tested-by: Kaizen Reviewed-by: Anthony Barbier --- framework/Framework.cpp | 6 +++--- framework/Framework.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'framework') diff --git a/framework/Framework.cpp b/framework/Framework.cpp index e3ada039ae..343168426c 100644 --- a/framework/Framework.cpp +++ b/framework/Framework.cpp @@ -97,10 +97,10 @@ Framework &Framework::get() return instance; } -void Framework::init(const std::vector &instruments, int num_iterations, DatasetMode mode, const std::string &name_filter, const std::string &id_filter) +void Framework::init(const std::vector &instruments, int num_iterations, DatasetMode mode, const std::string &name_filter, int64_t id_filter) { _test_name_filter = std::regex{ name_filter }; - _test_id_filter = std::regex{ id_filter }; + _test_id_filter = id_filter; _num_iterations = num_iterations; _dataset_mode = mode; @@ -191,7 +191,7 @@ bool Framework::is_enabled(const TestId &id) const return false; } - if(!std::regex_search(support::cpp11::to_string(test_id), _test_id_filter)) + if(_test_id_filter > -1 && _test_id_filter != test_id) { return false; } diff --git a/framework/Framework.h b/framework/Framework.h index 2fb81ee40f..bdaf806e21 100644 --- a/framework/Framework.h +++ b/framework/Framework.h @@ -87,9 +87,9 @@ public: * @param[in] num_iterations Number of iterations per test. * @param[in] mode Dataset mode. * @param[in] name_filter Regular expression to filter tests by name. Only matching tests will be executed. - * @param[in] id_filter Regular expression to filter tests by id. Only matching tests will be executed. + * @param[in] id_filter Test id. Only this test will be executed. */ - void init(const std::vector &instruments, int num_iterations, DatasetMode mode, const std::string &name_filter, const std::string &id_filter); + void init(const std::vector &instruments, int num_iterations, DatasetMode mode, const std::string &name_filter, int64_t id_filter); /** Add a new test suite. * @@ -259,7 +259,7 @@ private: InstrumentType _instruments{ InstrumentType::NONE }; std::regex _test_name_filter{ ".*" }; - std::regex _test_id_filter{ ".*" }; + int64_t _test_id_filter{ -1 }; DatasetMode _dataset_mode{ DatasetMode::ALL }; TestResult *_current_test_result{ nullptr }; }; -- cgit v1.2.1