From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: ramsay@ramsayjones.plus.com, jacob.keller@gmail.com,
peff@peff.net, gitster@pobox.com, jrnieder@gmail.com,
johannes.schindelin@gmail.com, Jens.Lehmann@web.de,
ericsunshine@gmail.com, Stefan Beller <sbeller@google.com>
Subject: [PATCH 5/8] test-run-command: Increase test coverage
Date: Tue, 20 Oct 2015 15:43:47 -0700 [thread overview]
Message-ID: <1445381030-23912-6-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1445381030-23912-1-git-send-email-sbeller@google.com>
Currently we have exact 4 jobs to be run with at most 4 parallel
processes. This sounds as if we're testing only one special case,
but in reality we want to have any number of tasks be processed
successfully, so test:
* more tasks than max jobs (implying slots get reused)
* equal number of jobs and max jobs
* less tasks than max jobs (implying there are unused slots)
Signed-off-by: Stefan Beller <sbeller@google.com>
---
t/t0061-run-command.sh | 16 +++++++++++++---
test-run-command.c | 14 +++++++++-----
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh
index 0af77cd..f27ada7 100755
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@ -62,8 +62,18 @@ Hello
World
EOF
-test_expect_success 'run_command runs in parallel' '
- test-run-command run-command-parallel-4 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
+test_expect_success 'run_command runs in parallel with more jobs available than tasks' '
+ test-run-command run-command-parallel 5 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'run_command runs in parallel with as many jobs as tasks' '
+ test-run-command run-command-parallel 4 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'run_command runs in parallel with more tasks than jobs available' '
+ test-run-command run-command-parallel 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
test_cmp expect actual
'
@@ -77,7 +87,7 @@ asking for a quick stop
EOF
test_expect_success 'run_command is asked to abort gracefully' '
- test-run-command run-command-abort-3 false 2>actual &&
+ test-run-command run-command-abort 3 false 2>actual &&
test_cmp expect actual
'
diff --git a/test-run-command.c b/test-run-command.c
index 4b59482..c8770c2 100644
--- a/test-run-command.c
+++ b/test-run-command.c
@@ -47,10 +47,11 @@ static int task_finished(int result,
int main(int argc, char **argv)
{
struct child_process proc = CHILD_PROCESS_INIT;
+ int jobs;
if (argc < 3)
return 1;
- proc.argv = (const char **)argv+2;
+ proc.argv = (const char **)argv + 2;
if (!strcmp(argv[1], "start-command-ENOENT")) {
if (start_command(&proc) < 0 && errno == ENOENT)
@@ -61,12 +62,15 @@ int main(int argc, char **argv)
if (!strcmp(argv[1], "run-command"))
exit(run_command(&proc));
- if (!strcmp(argv[1], "run-command-parallel-4"))
- exit(run_processes_parallel(4, parallel_next,
+ jobs = atoi(argv[2]);
+ proc.argv = (const char **)argv + 3;
+
+ if (!strcmp(argv[1], "run-command-parallel"))
+ exit(run_processes_parallel(jobs, parallel_next,
NULL, NULL, &proc));
- if (!strcmp(argv[1], "run-command-abort-3"))
- exit(run_processes_parallel(3, parallel_next,
+ if (!strcmp(argv[1], "run-command-abort"))
+ exit(run_processes_parallel(jobs, parallel_next,
NULL, task_finished, &proc));
fprintf(stderr, "check usage\n");
--
2.5.0.275.gbfc1651.dirty
next prev parent reply other threads:[~2015-10-20 22:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-20 22:43 [PATCH 0/8] Fixes for the parallel processing engine and git submodule update Stefan Beller
2015-10-20 22:43 ` [PATCH 1/8] run-command: Fix early shutdown Stefan Beller
2015-10-20 22:43 ` [PATCH 2/8] run-command: Call get_next_task with a clean child process Stefan Beller
2015-10-20 23:05 ` Junio C Hamano
2015-10-20 23:05 ` Junio C Hamano
2015-10-21 20:30 ` Junio C Hamano
2015-10-21 21:07 ` Stefan Beller
2015-10-20 22:43 ` [PATCH 3/8] run-command: Initialize the shutdown flag Stefan Beller
2015-10-20 22:43 ` [PATCH 4/8] test-run-command: Test for gracefully aborting Stefan Beller
2015-10-20 22:43 ` Stefan Beller [this message]
2015-10-20 22:43 ` [PATCH 6/8] run-command: Fix missing output from late callbacks Stefan Beller
2015-10-20 22:43 ` [PATCH 7/8] submodule config: Keep update strategy around Stefan Beller
2015-10-20 22:43 ` [PATCH 8/8] git submodule update: Have a dedicated helper for cloning Stefan Beller
2015-10-21 20:47 ` Junio C Hamano
2015-10-21 21:06 ` Stefan Beller
2015-10-21 21:23 ` Junio C Hamano
2015-10-21 22:14 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445381030-23912-6-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=ericsunshine@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=johannes.schindelin@gmail.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).