From d03b00acd71847fa2db1c5308c87d3b57c781bf9 Mon Sep 17 00:00:00 2001 From: Moritz Pflanzer Date: Mon, 17 Jul 2017 13:50:12 +0100 Subject: COMPMID-415: Fix dataset modes Change-Id: I266e8a22890c914edb3335104f073e79d2bf0ad9 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/80766 Tested-by: Kaizen Reviewed-by: Anthony Barbier --- framework/Macros.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'framework/Macros.h') diff --git a/framework/Macros.h b/framework/Macros.h index e3ef71ac56..38eb29c6a1 100644 --- a/framework/Macros.h +++ b/framework/Macros.h @@ -76,28 +76,28 @@ { \ FIXTURE::teardown(); \ } -#define TEST_REGISTRAR(TEST_NAME) \ +#define TEST_REGISTRAR(TEST_NAME, MODE) \ static arm_compute::test::framework::detail::TestCaseRegistrar TEST_NAME##_reg \ { \ - #TEST_NAME \ + #TEST_NAME, MODE \ } -#define DATA_TEST_REGISTRAR(TEST_NAME, DATASET) \ +#define DATA_TEST_REGISTRAR(TEST_NAME, MODE, DATASET) \ static arm_compute::test::framework::detail::TestCaseRegistrar TEST_NAME##_reg \ { \ - #TEST_NAME, DATASET \ + #TEST_NAME, MODE, DATASET \ } -#define TEST_CASE(TEST_NAME) \ +#define TEST_CASE(TEST_NAME, MODE) \ class TEST_NAME : public arm_compute::test::framework::TestCase \ { \ public: \ TEST_CASE_CONSTRUCTOR(TEST_NAME) \ void do_run() override; \ }; \ - TEST_REGISTRAR(TEST_NAME); \ + TEST_REGISTRAR(TEST_NAME, MODE); \ void TEST_NAME::do_run() -#define DATA_TEST_CASE(TEST_NAME, DATASET, ...) \ +#define DATA_TEST_CASE(TEST_NAME, MODE, DATASET, ...) \ class TEST_NAME : public arm_compute::test::framework::DataTestCase \ { \ public: \ @@ -108,10 +108,10 @@ } \ void run(__VA_ARGS__); \ }; \ - DATA_TEST_REGISTRAR(TEST_NAME, DATASET); \ + DATA_TEST_REGISTRAR(TEST_NAME, MODE, DATASET); \ void TEST_NAME::run(__VA_ARGS__) -#define FIXTURE_TEST_CASE(TEST_NAME, FIXTURE) \ +#define FIXTURE_TEST_CASE(TEST_NAME, FIXTURE, MODE) \ class TEST_NAME : public arm_compute::test::framework::TestCase, public FIXTURE \ { \ public: \ @@ -120,10 +120,10 @@ void do_run() override; \ FIXTURE_TEARDOWN(FIXTURE) \ }; \ - TEST_REGISTRAR(TEST_NAME); \ + TEST_REGISTRAR(TEST_NAME, MODE); \ void TEST_NAME::do_run() -#define FIXTURE_DATA_TEST_CASE(TEST_NAME, FIXTURE, DATASET) \ +#define FIXTURE_DATA_TEST_CASE(TEST_NAME, FIXTURE, MODE, DATASET) \ class TEST_NAME : public arm_compute::test::framework::DataTestCase, public FIXTURE \ { \ public: \ @@ -132,10 +132,10 @@ void do_run() override; \ FIXTURE_TEARDOWN(FIXTURE) \ }; \ - DATA_TEST_REGISTRAR(TEST_NAME, DATASET); \ + DATA_TEST_REGISTRAR(TEST_NAME, MODE, DATASET); \ void TEST_NAME::do_run() -#define REGISTER_FIXTURE_TEST_CASE(TEST_NAME, FIXTURE) \ +#define REGISTER_FIXTURE_TEST_CASE(TEST_NAME, FIXTURE, MODE) \ class TEST_NAME : public arm_compute::test::framework::TestCase, public FIXTURE \ { \ public: \ @@ -144,9 +144,9 @@ FIXTURE_RUN(FIXTURE) \ FIXTURE_TEARDOWN(FIXTURE) \ }; \ - TEST_REGISTRAR(TEST_NAME) + TEST_REGISTRAR(TEST_NAME, MODE) -#define REGISTER_FIXTURE_DATA_TEST_CASE(TEST_NAME, FIXTURE, DATASET) \ +#define REGISTER_FIXTURE_DATA_TEST_CASE(TEST_NAME, FIXTURE, MODE, DATASET) \ class TEST_NAME : public arm_compute::test::framework::DataTestCase, public FIXTURE \ { \ public: \ @@ -155,7 +155,7 @@ FIXTURE_RUN(FIXTURE) \ FIXTURE_TEARDOWN(FIXTURE) \ }; \ - DATA_TEST_REGISTRAR(TEST_NAME, DATASET) + DATA_TEST_REGISTRAR(TEST_NAME, MODE, DATASET) // // TEST CASE MACROS END // -- cgit v1.2.1