From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 12FEF10E002 for ; Tue, 24 Oct 2023 13:57:44 +0000 (UTC) Date: Tue, 24 Oct 2023 15:57:38 +0200 From: Mauro Carvalho Chehab To: Petri Latvala Message-ID: <20231024155738.552fe164@maurocar-mobl2> In-Reply-To: <20231020133041.58257-2-adrinael@adrinael.net> References: <20231020133041.58257-1-adrinael@adrinael.net> <20231020133041.58257-2-adrinael@adrinael.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [igt-dev] [PATCH 2/3] runner/runner_tests: Unit tests for binary-name-only testlist entries List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On Fri, 20 Oct 2023 16:30:40 +0300 Petri Latvala wrote: > Signed-off-by: Petri Latvala Acked-by: Mauro Carvalho Chehab > --- > runner/runner_tests.c | 70 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 70 insertions(+) > > diff --git a/runner/runner_tests.c b/runner/runner_tests.c > index a7e968f85..e6024de11 100644 > --- a/runner/runner_tests.c > +++ b/runner/runner_tests.c > @@ -1810,6 +1810,76 @@ igt_main > } > } > > + igt_subtest_group { > + const char testlisttext[] = "igt@successtest"; > + const char blocktext[] = "igt@successtest@first"; > + struct job_list *list = malloc(sizeof(*list)); > + volatile int dirfd = -1; > + char dirname[] = "tmpdirXXXXXX"; > + volatile int listfd; > + volatile int blockfd; > + char listfilename[] = "tmplistXXXXXX"; > + char blockfilename[] = "tmpblockXXXXXX"; > + > + igt_fixture { > + igt_require(mkdtemp(dirname) != NULL); > + rmdir(dirname); > + > + igt_require((listfd = mkstemp(listfilename)) >= 0); > + igt_require(write(listfd, testlisttext, strlen(testlisttext)) == strlen(testlisttext)); > + igt_require((blockfd = mkstemp(blockfilename)) >= 0); > + igt_require(write(blockfd, blocktext, strlen(blocktext)) == strlen(blocktext)); > + close(listfd); > + close(blockfd); > + > + init_job_list(list); > + } > + > + igt_subtest("only-binary-name-in-testlist") { > + const char *argv[] = { "runner", > + "--allow-non-root", > + "--test-list", listfilename, > + testdatadir, > + dirname, > + }; > + > + igt_assert(parse_options(ARRAY_SIZE(argv), (char**)argv, settings)); > + > + igt_assert(create_job_list(list, settings)); > + /* No multi-mode, binary has two subtests, should be normalized to have individual subtests */ > + igt_assert_eq(list->size, 2); > + igt_assert_eq(list->entries[0].subtest_count, 1); > + igt_assert_eq(list->entries[1].subtest_count, 1); > + } > + > + igt_subtest("only-binary-name-in-testlist-with-blocks") { > + const char *argv[] = { "runner", > + "--allow-non-root", > + "--test-list", listfilename, > + "-b", blockfilename, > + testdatadir, > + dirname, > + }; > + > + igt_assert(parse_options(ARRAY_SIZE(argv), (char**)argv, settings)); > + > + igt_assert(create_job_list(list, settings)); > + /* No multi-mode, binary has two subtests, one of them blocked */ > + igt_assert_eq(list->size, 1); > + igt_assert_eq(list->entries[0].subtest_count, 1); > + igt_assert_eqstr(list->entries[0].subtests[0], "second-subtest"); > + } > + > + igt_fixture { > + unlink(listfilename); > + unlink(blockfilename); > + close(dirfd); > + clear_directory(dirname); > + free_job_list(list); > + free(list); > + } > + } > + > igt_subtest_group { > struct job_list *list = malloc(sizeof(*list)); > volatile int dirfd = -1;