From 51a3d0b8e9fb2fa2897b80d619d0175171b8ab8a Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 31 Jan 2018 20:22:15 +0100 Subject: [PATCH] tests: some cleanups --- fpga/tests/main.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fpga/tests/main.cpp b/fpga/tests/main.cpp index 60ef1637f..844e3b64b 100644 --- a/fpga/tests/main.cpp +++ b/fpga/tests/main.cpp @@ -50,11 +50,12 @@ static bool suite_enabled(struct criterion_test_set *tests, const char *name) } /* Limit number of parallel jobs to 1 in case we use the FPGA */ -ReportHook(PRE_ALL)(struct criterion_test_set *tests) { +ReportHook(PRE_ALL)(struct criterion_test_set *tests) +{ if (suite_enabled(tests, "fpga")) { auto logger = loggerGetOrCreate("unittest"); - logger->info("FPGA tests enabled. Only 1 job is executed in parallel!.\n"); + logger->info("FPGA tests enabled. Only 1 job is executed in parallel!."); criterion_options.jobs = 1; } } @@ -62,18 +63,15 @@ ReportHook(PRE_ALL)(struct criterion_test_set *tests) { int main(int argc, char *argv[]) { int ret; - - struct criterion_test_set *tests; auto logger = loggerGetOrCreate("unittest"); spdlog::set_pattern("[%T] [%l] [%n] %v"); spdlog::set_level(spdlog::level::debug); /* Run criterion tests */ - tests = criterion_initialize(); + auto tests = criterion_initialize(); ret = criterion_handle_args(argc, argv, true); - if (ret) ret = !criterion_run_all_tests(tests);