{"id":12395,"url":"https://patchwork.libcamera.org/api/1.1/patches/12395/?format=json","web_url":"https://patchwork.libcamera.org/patch/12395/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210524191309.90238-6-nfraprado@collabora.com>","date":"2021-05-24T19:13:09","name":"[libcamera-devel,v5,5/5] lc-compliance: Add list and filter parameters","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"aeed2cc8aaafb5b95914f10a02437b7110c1c1d5","submitter":{"id":84,"url":"https://patchwork.libcamera.org/api/1.1/people/84/?format=json","name":"Nícolas F. R. A. Prado","email":"nfraprado@collabora.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12395/mbox/","series":[{"id":2057,"url":"https://patchwork.libcamera.org/api/1.1/series/2057/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2057","date":"2021-05-24T19:13:04","name":"lc-compliance: Refactor using Googletest","version":5,"mbox":"https://patchwork.libcamera.org/series/2057/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12395/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12395/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 896E5C3201\n\tfor ;\n\tMon, 24 May 2021 19:14:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3659C6891F;\n\tMon, 24 May 2021 21:14:16 +0200 (CEST)","from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 50169602B0\n\tfor ;\n\tMon, 24 May 2021 21:14:14 +0200 (CEST)","from [127.0.0.1] (localhost [127.0.0.1])\n\t(Authenticated sender: nfraprado) with ESMTPSA id 6BB5A1F41BAE"],"From":"=?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 24 May 2021 16:13:09 -0300","Message-Id":"<20210524191309.90238-6-nfraprado@collabora.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210524191309.90238-1-nfraprado@collabora.com>","References":"<20210524191309.90238-1-nfraprado@collabora.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 5/5] lc-compliance: Add list and filter\n\tparameters","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"kernel@collabora.com, =?utf-8?q?Andr=C3=A9_Almeida?=\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add a --list parameter that lists all current tests (by mapping to\ngoogletest's --gtest_list_tests).\n\nAdd a --filter 'filterString' parameter that filters the tests to run\n(by mapping to googletest's --gtest_filter).\n\nSigned-off-by: Nícolas F. R. A. Prado \n---\nChanges in v5:\n- Thanks to Niklas:\n - Moved buildGtestParameters() inside run()\n\nNo changes in v4\n\n src/lc-compliance/main.cpp | 71 +++++++++++++++++++++++++++++++++++---\n 1 file changed, 66 insertions(+), 5 deletions(-)","diff":"diff --git a/src/lc-compliance/main.cpp b/src/lc-compliance/main.cpp\nindex 27503372d0eb..182807a14c31 100644\n--- a/src/lc-compliance/main.cpp\n+++ b/src/lc-compliance/main.cpp\n@@ -20,6 +20,8 @@ using namespace libcamera;\n \n enum {\n \tOptCamera = 'c',\n+\tOptList = 'l',\n+\tOptFilter = 'f',\n \tOptHelp = 'h',\n };\n \n@@ -45,17 +47,25 @@ public:\n \t~Harness();\n \n \tint init();\n-\tint run(int argc, char **argv);\n+\tint run(char *arg0);\n+\tint buildGtestParameters(char *arg0);\n \n private:\n \tvoid listCameras();\n \n \tOptionsParser::Options options_;\n \tstd::shared_ptr cm_;\n+\n+\tconst std::map gtestFlag_ = { { \"list\", \"--gtest_list_tests\" },\n+\t\t\t\t\t\t\t\t{ \"filter\", \"--gtest_filter\" } };\n+\n+\tint gtestArgc_;\n+\tchar **gtestArgv_;\n+\tstd::string gtestFilterParam_;\n };\n \n Harness::Harness(const OptionsParser::Options &options)\n-\t: options_(options)\n+\t: options_(options), gtestArgv_(nullptr)\n {\n \tcm_ = std::make_shared();\n }\n@@ -63,6 +73,8 @@ Harness::Harness(const OptionsParser::Options &options)\n Harness::~Harness()\n {\n \tcm_->stop();\n+\n+\tfree(gtestArgv_);\n }\n \n int Harness::init()\n@@ -76,6 +88,9 @@ int Harness::init()\n \t\treturn ret;\n \t}\n \n+\tif (options_.isSet(OptList))\n+\t\treturn 0;\n+\n \tif (!options_.isSet(OptCamera)) {\n \t\tstd::cout << \"No camera specified, available cameras:\" << std::endl;\n \t\tlistCameras();\n@@ -97,9 +112,13 @@ int Harness::init()\n \treturn 0;\n }\n \n-int Harness::run(int argc, char **argv)\n+int Harness::run(char *arg0)\n {\n-\t::testing::InitGoogleTest(&argc, argv);\n+\tint ret = buildGtestParameters(arg0);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\t::testing::InitGoogleTest(>estArgc_, gtestArgv_);\n \n \ttesting::UnitTest::GetInstance()->listeners().Append(new ThrowListener);\n \n@@ -112,12 +131,54 @@ void Harness::listCameras()\n \t\tstd::cout << \"- \" << cam.get()->id() << std::endl;\n }\n \n+int Harness::buildGtestParameters(char *arg0)\n+{\n+\tint argc = 0;\n+\n+\t/*\n+\t * +2 to have space for both the 0th argument that is needed but not\n+\t * used and the null at the end.\n+\t */\n+\tgtestArgv_ = (char **) malloc((gtestFlag_.size() + 2) * sizeof(char *));\n+\tif (!gtestArgv_)\n+\t\treturn -ENOMEM;\n+\n+\tgtestArgv_[argc] = arg0;\n+\targc++;\n+\n+\tif (options_.isSet(OptList)) {\n+\t\tgtestArgv_[argc] = const_cast(gtestFlag_.at(\"list\").c_str());\n+\t\targc++;\n+\t}\n+\n+\tif (options_.isSet(OptFilter)) {\n+\t\t/*\n+\t\t * The filter flag needs to be passed as a single parameter, in\n+\t\t * the format --gtest_filter=filterStr\n+\t\t */\n+\t\tconst std::string &filter = options_[OptFilter];\n+\t\tgtestFilterParam_ = gtestFlag_.at(\"filter\") + \"=\" + filter;\n+\n+\t\tgtestArgv_[argc] = const_cast(gtestFilterParam_.c_str());\n+\t\targc++;\n+\t}\n+\n+\tgtestArgv_[argc] = 0;\n+\tgtestArgc_ = argc;\n+\n+\treturn 0;\n+}\n+\n static int parseOptions(int argc, char **argv, OptionsParser::Options *options)\n {\n \tOptionsParser parser;\n \tparser.addOption(OptCamera, OptionString,\n \t\t\t \"Specify which camera to operate on, by id\", \"camera\",\n \t\t\t ArgumentRequired, \"camera\");\n+\tparser.addOption(OptList, OptionNone, \"List all tests and exit\", \"list\");\n+\tparser.addOption(OptFilter, OptionString,\n+\t\t\t \"Specify which tests to run\", \"filter\",\n+\t\t\t ArgumentRequired, \"filter\");\n \tparser.addOption(OptHelp, OptionNone, \"Display this help message\",\n \t\t\t \"help\");\n \n@@ -147,5 +208,5 @@ int main(int argc, char **argv)\n \tif (ret)\n \t\treturn ret;\n \n-\treturn harness.run(argc, argv);\n+\treturn harness.run(argv[0]);\n }\n","prefixes":["libcamera-devel","v5","5/5"]}