Merge branch 'upstream'

2017-01-09 22:59:46 -05:00
parent b126279b52 08a300d1a6
commit 93cc12e3f2
11 changed files with 162 additions and 39 deletions
--- a/userland/testbin/multiexec/multiexec.c
+++ b/userland/testbin/multiexec/multiexec.c
@@ -174,8 +174,11 @@ spawn(int njobs)
 	for (i=0; i<njobs; i++) {
 		pids[i] = fork();
 		if (pids[i] == -1) {
-			/* abandon the other procs; no way to kill them */
-			err(1, "fork");
+			/* continue with the procs we have; cannot kill them */
+			warn("fork");
+			warnx("*** Only started %u processes ***", i);
+			njobs = i;
+			break;
 		}
 		if (pids[i] == 0) {
 			/* child */