From 681f967c8fb67d4af8de49a4298965ba61878384 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 1 Aug 2016 14:03:33 +1000 Subject: [PATCH] test: if a filter is specified, don't parallelize jobs by default Likely testing a specific set of tests, possibly in gdb. So don't parallelize. Signed-off-by: Peter Hutterer --- test/litest.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/litest.c b/test/litest.c index 5a8498f..902543d 100644 --- a/test/litest.c +++ b/test/litest.c @@ -3099,6 +3099,12 @@ litest_parse_argv(int argc, char **argv) { 0, 0, 0, 0} }; + enum { + JOBS_DEFAULT, + JOBS_SINGLE, + JOBS_CUSTOM + } want_jobs = JOBS_DEFAULT; + while(1) { int c; int option_index = 0; @@ -3109,16 +3115,23 @@ litest_parse_argv(int argc, char **argv) switch(c) { case OPT_FILTER_TEST: filter_test = optarg; + if (want_jobs == JOBS_DEFAULT) + want_jobs = JOBS_SINGLE; break; case OPT_FILTER_DEVICE: filter_device = optarg; + if (want_jobs == JOBS_DEFAULT) + want_jobs = JOBS_SINGLE; break; case OPT_FILTER_GROUP: filter_group = optarg; + if (want_jobs == JOBS_DEFAULT) + want_jobs = JOBS_SINGLE; break; case 'j': case OPT_JOBS: jobs = atoi(optarg); + want_jobs = JOBS_CUSTOM; break; case OPT_LIST: return LITEST_MODE_LIST; @@ -3131,6 +3144,9 @@ litest_parse_argv(int argc, char **argv) } } + if (want_jobs == JOBS_SINGLE) + jobs = 1; + return LITEST_MODE_TEST; } -- 2.7.4